diff --git a/Cartfile b/Cartfile
index 23cc13e1..fd729c42 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,4 @@
-github "SRGSSR/SRGMediaPlayer-iOS" "2.0.3"
-github "SRGSSR/srgdataprovider-ios" "5.4"
+github "SRGSSR/SRGMediaPlayer-iOS" "2.0.4"
+github "SRGSSR/srgdataprovider-ios" "5.4.1"
+github "SRGSSR/tagcommander-ios" "4.1.3_4.1.1"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 918dad9e..b7ad4e81 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,8 +1,9 @@
 github "Mantle/Mantle" "2.1.0"
 github "SRGSSR/MAKVONotificationCenter" "4a127e52997889729286510103f7e27100223730"
-github "SRGSSR/SRGMediaPlayer-iOS" "2.0.3"
+github "SRGSSR/SRGMediaPlayer-iOS" "2.0.4"
 github "SRGSSR/libextobjc" "cf5eb0c8a2f6f85636f1fb6a1f2083cbc74899f9"
-github "SRGSSR/srgdataprovider-ios" "5.4"
+github "SRGSSR/srgdataprovider-ios" "5.4.1"
 github "SRGSSR/srglogger-ios" "1.0"
+github "SRGSSR/tagcommander-ios" "4.1.3_4.1.1"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
 github "kif-framework/KIF" "v3.5.2"
diff --git a/Demo/Info.plist b/Demo/Info.plist
index 730c9deb..4707844f 100644
--- a/Demo/Info.plist
+++ b/Demo/Info.plist
@@ -46,5 +46,33 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>srgtraffic</string>
+		<string>srf</string>
+		<string>srfsport</string>
+		<string>srfplayer</string>
+		<string>srfmeteo</string>
+		<string>srfradio3</string>
+		<string>srfvirus</string>
+		<string>srfjass</string>
+		<string>rtsinfo</string>
+		<string>rtssport</string>
+		<string>playrts</string>
+		<string>couleur3</string>
+		<string>dtqc3</string>
+		<string>rtsradio</string>
+		<string>rsinews</string>
+		<string>rsisport</string>
+		<string>playrsi</string>
+		<string>rsich</string>
+		<string>rsiibazaar</string>
+		<string>rsizerovero</string>
+		<string>rsipeo</string>
+		<string>playrtr</string>
+		<string>ch.swissinfo.news</string>
+		<string>playswi</string>
+		<string>tvsvizzera</string>
+	</array>
 </dict>
 </plist>
diff --git a/Demo/Resources/LaunchScreen.xib b/Demo/Resources/LaunchScreen.xib
index 3878b68a..f7cdadd5 100644
--- a/Demo/Resources/LaunchScreen.xib
+++ b/Demo/Resources/LaunchScreen.xib
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -15,17 +19,17 @@
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright (c) SRG SSR. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SRGAnalytics Demo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="140" width="441" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                 <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
diff --git a/Demo/Sources/Application/AppDelegate.m b/Demo/Sources/Application/AppDelegate.m
index c75332d5..3a89b597 100644
--- a/Demo/Sources/Application/AppDelegate.m
+++ b/Demo/Sources/Application/AppDelegate.m
@@ -12,6 +12,7 @@
 #import <SRGAnalytics/SRGAnalytics.h>
 #import <SRGAnalytics_MediaPlayer/SRGAnalytics_MediaPlayer.h>
 #import <SRGLogger/SRGLogger.h>
+#import <TCCore/TCCore.h>
 
 @implementation AppDelegate
 
@@ -25,9 +26,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     
     [SRGLogger setLogHandler:SRGNSLogHandler()];
     
-    [[SRGAnalyticsTracker sharedTracker] startWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierTEST
-                                                     comScoreVirtualSite:@"rts-app-test-v"
-                                                     netMetrixIdentifier:@"test"];
+    [TCDebug setDebugLevel:TCLogLevel_Verbose];
+    [TCDebug setNotificationLog:YES];
+    
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierRTS
+                                                                                                       container:10
+                                                                                             comScoreVirtualSite:@"rts-app-test-v"
+                                                                                             netMetrixIdentifier:@"test"];
+    configuration.unitTesting = (NSClassFromString(@"XCTestCase") != Nil);
+    [[SRGAnalyticsTracker sharedTracker] startWithConfiguration:configuration];
     
     DemosViewController *demosViewController = [[DemosViewController alloc] init];
     self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:demosViewController];
diff --git a/Demo/Sources/Demos/DemosViewController.m b/Demo/Sources/Demos/DemosViewController.m
index b3f0e4ec..29e3ae8b 100644
--- a/Demo/Sources/Demos/DemosViewController.m
+++ b/Demo/Sources/Demos/DemosViewController.m
@@ -43,7 +43,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 case 0: {
                     simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking"
                                                                                 levels:nil
-                                                                          customLabels:nil
+                                                                            customInfo:nil
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:YES];
                     break;
@@ -52,7 +52,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 case 1: {
                     simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels"
                                                                                 levels:@[@"Level1", @"Level2", @"Level3"]
-                                                                          customLabels:nil
+                                                                            customInfo:nil
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:YES];
                     break;
@@ -61,16 +61,16 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 case 2: {
                     simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with many levels"
                                                                                 levels:@[@"Level1", @"Level2", @"Level3", @"Level4", @"Level5", @"Level6", @"Level7", @"Level8", @"Level9", @"Level10", @"Level11", @"Level12"]
-                                                                          customLabels:nil
+                                                                            customInfo:nil
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:YES];
                     break;
                 }
                     
                 case 3: {
-                    simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels and custom labels"
+                    simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels and labels"
                                                                                 levels:@[@"Level1", @"Level2"]
-                                                                          customLabels:@{ @"custom_label": @"custom_value" }
+                                                                            customInfo:@{ @"custom_label": @"custom_value" }
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:YES];
                     break;
@@ -79,7 +79,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 case 4: {
                     simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Manual tracking"
                                                                                 levels:nil
-                                                                          customLabels:nil
+                                                                            customInfo:nil
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:NO];
                     break;
@@ -88,7 +88,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 case 5: {
                     simpleViewController = [[SimpleViewController alloc] initWithTitle:@""
                                                                                 levels:nil
-                                                                          customLabels:nil
+                                                                            customInfo:nil
                                                             openedFromPushNotification:NO
                                                                   trackedAutomatically:YES];
                     break;
@@ -108,7 +108,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             
             switch (indexPath.row) {
                 case 0: {
-                    URL = [NSURL URLWithString:@"http://fr-par-iphone-2.cdn.hexaglobe.net/streaming/euronews_ewns/9-live.m3u8"];
+                    URL = [NSURL URLWithString:@"http://ndr_fs-lh.akamaihd.net/i/ndrfs_nds@119224/master.m3u8?dw=0"];
                     break;
                 }
                     
@@ -118,10 +118,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 }
                     
                 case 2: {
-                    URL = [NSURL URLWithString:@"https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR"];
+                    URL = [NSURL URLWithString:@"http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8"];
                     break;
                 }
-
                     
                 default: {
                     return;
@@ -138,7 +137,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         case 2: {
             UIViewController *simpleViewController = [[SimpleViewController alloc] initWithTitle:@"From push notification"
                                                                                           levels:nil
-                                                                                    customLabels:nil
+                                                                                      customInfo:nil
                                                                       openedFromPushNotification:YES
                                                                             trackedAutomatically:YES];
             [self.navigationController pushViewController:simpleViewController animated:YES];
diff --git a/Demo/Sources/Demos/DemosViewController.storyboard b/Demo/Sources/Demos/DemosViewController.storyboard
index 7eea9787..d36b4c9e 100644
--- a/Demo/Sources/Demos/DemosViewController.storyboard
+++ b/Demo/Sources/Demos/DemosViewController.storyboard
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Jou-aD-EGI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Jou-aD-EGI">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -21,11 +24,11 @@
                                         <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kFo-IY-tFV" id="C71-Tu-DOL">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="G7F-bw-BSq">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -38,11 +41,11 @@
                                         <rect key="frame" x="0.0" y="99.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jAL-0d-Asf" id="6Nz-sv-iv4">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with levels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bJh-LQ-S2B">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -55,11 +58,11 @@
                                         <rect key="frame" x="0.0" y="143.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aAD-3m-Cca" id="YmX-By-ucz">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with many levels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RR0-uN-yJ6">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -72,11 +75,11 @@
                                         <rect key="frame" x="0.0" y="187.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4bx-Zc-UpE" id="6rs-WU-2Ok">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with levels and custom labels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1Bx-Fe-vI4">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Automatic tracking with levels and labels" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1Bx-Fe-vI4">
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -89,11 +92,11 @@
                                         <rect key="frame" x="0.0" y="231.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yFw-Iq-dLV" id="Egw-ga-Jmp">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Manual tracking" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="g2L-qK-XxP">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -106,11 +109,11 @@
                                         <rect key="frame" x="0.0" y="275.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9MI-95-NfD" id="hUT-jD-sd7">
-                                            <frame key="frameInset" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Missing title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tJ4-bg-Tzv">
-                                                    <frame key="frameInset" minX="15" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -127,11 +130,11 @@
                                         <rect key="frame" x="0.0" y="367.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FmI-Gn-LI5" id="9mq-Ct-n70">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Live" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="erq-Wv-rYw">
-                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -144,11 +147,11 @@
                                         <rect key="frame" x="0.0" y="411.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="443-Sy-dL9" id="Lcf-vL-m5l">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="VOD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sam-4U-lcR">
-                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -161,11 +164,11 @@
                                         <rect key="frame" x="0.0" y="455.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KaE-PO-c01" id="wly-Tn-Xu4">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="DVR" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Eon-le-PuK">
-                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -182,11 +185,11 @@
                                         <rect key="frame" x="0.0" y="547.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G6n-w3-nwk" id="cjW-aM-loc">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="From push notification (simulated)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ohJ-HR-Klh">
-                                                    <frame key="frameInset" minX="15" width="345" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
diff --git a/Demo/Sources/Simple/SimpleViewController.h b/Demo/Sources/Simple/SimpleViewController.h
index 4f6fa25e..3525a564 100644
--- a/Demo/Sources/Simple/SimpleViewController.h
+++ b/Demo/Sources/Simple/SimpleViewController.h
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithTitle:(nullable NSString *)title
                        levels:(nullable NSArray<NSString *> *)levels
-                 customLabels:(nullable NSDictionary<NSString *, NSString *> *)customLabels
+                   customInfo:(nullable NSDictionary<NSString *, NSString *> *)customInfo
    openedFromPushNotification:(BOOL)openedFromPushNotification
          trackedAutomatically:(BOOL)trackedAutomatically NS_DESIGNATED_INITIALIZER;
 
diff --git a/Demo/Sources/Simple/SimpleViewController.m b/Demo/Sources/Simple/SimpleViewController.m
index 90ded67e..0f703803 100644
--- a/Demo/Sources/Simple/SimpleViewController.m
+++ b/Demo/Sources/Simple/SimpleViewController.m
@@ -9,7 +9,7 @@
 @interface SimpleViewController ()
 
 @property (nonatomic) NSArray<NSString *> *levels;
-@property (nonatomic) NSDictionary<NSString *, NSString *> *customLabels;
+@property (nonatomic) NSDictionary<NSString *, NSString *> *customInfo;
 @property (nonatomic, getter=isOpenedFromPushNotification) BOOL openedFromPushNotification;
 @property (nonatomic, getter=isTrackedAutomatically) BOOL trackedAutomatically;
 
@@ -22,13 +22,17 @@ @implementation SimpleViewController
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-designated-initializers"
 
-- (instancetype)initWithTitle:(NSString *)title levels:(NSArray<NSString *> *)levels customLabels:(NSDictionary<NSString *,NSString *> *)customLabels openedFromPushNotification:(BOOL)openedFromPushNotification trackedAutomatically:(BOOL)trackedAutomatically
+- (instancetype)initWithTitle:(NSString *)title
+                       levels:(NSArray<NSString *> *)levels
+                   customInfo:(NSDictionary<NSString *, NSString *> *)customInfo
+   openedFromPushNotification:(BOOL)openedFromPushNotification
+         trackedAutomatically:(BOOL)trackedAutomatically
 {
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:NSStringFromClass([self class]) bundle:nil];
     SimpleViewController *viewController = [storyboard instantiateInitialViewController];
     viewController.title = title;
     viewController.levels = levels;
-    viewController.customLabels = customLabels;
+    viewController.customInfo = customInfo;
     viewController.openedFromPushNotification = openedFromPushNotification;
     viewController.trackedAutomatically = trackedAutomatically;
     return viewController;
@@ -37,13 +41,13 @@ - (instancetype)initWithTitle:(NSString *)title levels:(NSArray<NSString *> *)le
 - (instancetype)init
 {
     [self doesNotRecognizeSelector:_cmd];
-    return [self initWithTitle:nil levels:nil customLabels:nil openedFromPushNotification:NO trackedAutomatically:YES];
+    return [self initWithTitle:nil levels:nil customInfo:nil openedFromPushNotification:NO trackedAutomatically:YES];
 }
 
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     [self doesNotRecognizeSelector:_cmd];
-    return [self initWithTitle:nil levels:nil customLabels:nil openedFromPushNotification:NO trackedAutomatically:YES];
+    return [self initWithTitle:nil levels:nil customInfo:nil openedFromPushNotification:NO trackedAutomatically:YES];
 }
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder
@@ -70,9 +74,12 @@ - (NSArray *)srg_pageViewLevels
     return self.levels;
 }
 
-- (NSDictionary *)srg_pageViewCustomLabels
+- (SRGAnalyticsPageViewLabels *)srg_pageViewLabels
 {
-    return self.customLabels;
+    SRGAnalyticsPageViewLabels *labels = [[SRGAnalyticsPageViewLabels alloc] init];
+    labels.customInfo = self.customInfo;
+    labels.comScoreCustomInfo = self.customInfo;
+    return labels;
 }
 
 - (BOOL)srg_isOpenedFromPushNotification
diff --git a/DemoTests/ComScoreViewEventTests.m b/DemoTests/ComScoreViewEventTests.m
new file mode 100644
index 00000000..e4c0193c
--- /dev/null
+++ b/DemoTests/ComScoreViewEventTests.m
@@ -0,0 +1,230 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import <KIF/KIF.h>
+#import <SRGAnalytics/SRGAnalytics.h>
+#import <UIKit/UIKit.h>
+
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
+
+static NSDictionary *s_startLabels = nil;
+
+@interface ComScoreViewEventTests : KIFTestCase
+
+@end
+
+@implementation ComScoreViewEventTests
+
+#pragma mark Setup and tear down
+
+- (void)setUp
+{
+    [super setUp];
+    
+    [KIFSystemTestActor setDefaultTimeout:60.0];
+}
+
+#pragma mark Helpers
+
+- (XCTestExpectation *)expectationForComScoreViewEventNotificationWithHandler:(EventExpectationHandler)handler
+{
+    return [self expectationForNotification:SRGAnalyticsComScoreRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsComScoreLabelsKey];
+        
+        NSString *type = labels[@"ns_type"];
+        if (! [type isEqualToString:@"view"]) {
+            return NO;
+        }
+        
+        // Discard start events (outside our control)
+        NSString *event = labels[@"ns_ap_ev"];
+        if ([event isEqualToString:@"start"]) {
+            return NO;
+        }
+        
+        return handler(event, labels);
+    }];
+}
+
+- (XCTestExpectation *)expectationForElapsedTimeInterval:(NSTimeInterval)timeInterval withHandler:(void (^)(void))handler
+{
+    XCTestExpectation *expectation = [self expectationWithDescription:[NSString stringWithFormat:@"Wait for %@ seconds", @(timeInterval)]];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeInterval * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [expectation fulfill];
+        handler ? handler() : nil;
+    });
+    return expectation;
+}
+
+#pragma mark Tests
+
+// For all tests, use KIF only to control the UI and wait for UI responses. For tests and waiting on other conditions, use
+// XCTest. While KIF provides similar functionalities, e.g. for waiting on notifications, expectations cannot be defined
+// prior to some code being run (e.g. tapping a UI element). If the code being run triggers the notification, it is
+// impossible to catch it with KIF. This is why the expectation - action - waiting model of XCTest is used instead
+
+- (void)testAutomaticTracking
+{
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"name"], @"app.automatic-tracking");
+        XCTAssertEqualObjects(labels[@"category"], @"app");
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
+        XCTAssertEqualObjects(labels[@"srg_n1"], @"app");
+        XCTAssertNil(labels[@"srg_n2"]);
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking");
+        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+        return YES;
+    }];
+    
+    // Test NetMetrix notification as well. Not tested elsewhere since always the same
+    [self expectationForNotification:SRGAnalyticsNetmetrixRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
+        NSURL *URL = notification.userInfo[SRGAnalyticsNetmetrixURLKey];
+        XCTAssertTrue([URL.absoluteString containsString:@"/apps/test/ios/"]);
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testAutomaticTrackingWithLevels
+{
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.level3.automatic-tracking-with-levels");
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
+        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
+        XCTAssertEqualObjects(labels[@"srg_n3"], @"Level3");
+        XCTAssertNil(labels[@"srg_n4"]);
+        XCTAssertEqualObjects(labels[@"category"], @"level1.level2.level3");
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with levels");
+        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testMaximumNumberOfLevels
+{
+    // The SRG standard only has srg_nX fields up to 10. The full hierarchy is still obtained from the name and category labels, though
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.level3.level4.level5.level6.level7.level8.level9.level10.level11.level12.automatic-tracking-with-many-levels");
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
+        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
+        XCTAssertEqualObjects(labels[@"srg_n3"], @"Level3");
+        XCTAssertEqualObjects(labels[@"srg_n4"], @"Level4");
+        XCTAssertEqualObjects(labels[@"srg_n5"], @"Level5");
+        XCTAssertEqualObjects(labels[@"srg_n6"], @"Level6");
+        XCTAssertEqualObjects(labels[@"srg_n7"], @"Level7");
+        XCTAssertEqualObjects(labels[@"srg_n8"], @"Level8");
+        XCTAssertEqualObjects(labels[@"srg_n9"], @"Level9");
+        XCTAssertEqualObjects(labels[@"srg_n10"], @"Level10");
+        XCTAssertNil(labels[@"srg_n11"]);
+        XCTAssertEqualObjects(labels[@"category"], @"level1.level2.level3.level4.level5.level6.level7.level8.level9.level10.level11.level12");
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with many levels");
+        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testAutomaticTrackingWithLevelsAndLabels
+{
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.automatic-tracking-with-levels-and-labels");
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
+        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
+        XCTAssertNil(labels[@"srg_n3"]);
+        XCTAssertEqualObjects(labels[@"category"], @"level1.level2");
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with levels and labels");
+        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+        XCTAssertEqualObjects(labels[@"custom_label"], @"custom_value");
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:3 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testManualTracking
+{
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"name"], @"app.manual-tracking");
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
+        XCTAssertEqualObjects(labels[@"srg_n1"], @"app");
+        XCTAssertNil(labels[@"srg_n2"]);
+        XCTAssertEqualObjects(labels[@"category"], @"app");
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Manual tracking");
+        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:4 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    [tester waitForTappableViewWithAccessibilityLabel:@"Track"];
+    [tester tapViewWithAccessibilityLabel:@"Track"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testMissingTitle
+{
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForName:SRGAnalyticsComScoreRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+        XCTFail(@"No event must be sent when the title is empty");
+    }];
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:5 inSection:0] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+- (void)testFromPushNotification
+{
+    [self expectationForComScoreViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"1");
+        return YES;
+    }];
+    
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:2] inTableViewWithAccessibilityIdentifier:@"tableView"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+    
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    [tester waitForTimeInterval:2.];
+}
+
+@end
diff --git a/DemoTests/ViewEventTests.m b/DemoTests/ViewEventTests.m
index 032efebf..e6d9e2b7 100644
--- a/DemoTests/ViewEventTests.m
+++ b/DemoTests/ViewEventTests.m
@@ -8,15 +8,15 @@
 #import <SRGAnalytics/SRGAnalytics.h>
 #import <UIKit/UIKit.h>
 
-typedef BOOL (^EventExpectationHandler)(NSString *type, NSDictionary *labels);
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
 
 static NSDictionary *s_startLabels = nil;
 
-@interface SRGAnalytics_Demo_1_EventTests : KIFTestCase
+@interface ViewEventTests : KIFTestCase
 
 @end
 
-@implementation SRGAnalytics_Demo_1_EventTests
+@implementation ViewEventTests
 
 #pragma mark Setup and tear down
 
@@ -31,17 +31,11 @@ - (void)setUp
 
 - (XCTestExpectation *)expectationForViewEventNotificationWithHandler:(EventExpectationHandler)handler
 {
-    return [self expectationForNotification:SRGAnalyticsComScoreRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
-        NSDictionary *labels = notification.userInfo[SRGAnalyticsComScoreLabelsKey];
+    return [self expectationForNotification:SRGAnalyticsRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsLabelsKey];
         
-        NSString *type = labels[@"ns_type"];
-        if (! [type isEqualToString:@"view"]) {
-            return NO;
-        }
-        
-        // Discard start events (outside our control)
-        NSString *event = labels[@"ns_ap_ev"];
-        if ([event isEqualToString:@"start"]) {
+        NSString *event = labels[@"event_id"];
+        if (! [event isEqualToString:@"screen"]) {
             return NO;
         }
         
@@ -68,14 +62,12 @@ - (XCTestExpectation *)expectationForElapsedTimeInterval:(NSTimeInterval)timeInt
 
 - (void)testAutomaticTracking
 {
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"name"], @"app.automatic-tracking");
-        XCTAssertEqualObjects(labels[@"category"], @"app");
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
-        XCTAssertEqualObjects(labels[@"srg_n1"], @"app");
-        XCTAssertNil(labels[@"srg_n2"]);
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking");
-        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"navigation_property_type"], @"app");
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"false");
+        XCTAssertEqualObjects(labels[@"navigation_bu_distributer"], @"RTS");
+        XCTAssertEqualObjects(labels[@"content_title"], @"Automatic tracking");
+        XCTAssertEqualObjects(labels[@"page_id"], @"app.automatic-tracking");
         return YES;
     }];
     
@@ -96,16 +88,14 @@ - (void)testAutomaticTracking
 
 - (void)testAutomaticTrackingWithLevels
 {
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.level3.automatic-tracking-with-levels");
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
-        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
-        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
-        XCTAssertEqualObjects(labels[@"srg_n3"], @"Level3");
-        XCTAssertNil(labels[@"srg_n4"]);
-        XCTAssertEqualObjects(labels[@"category"], @"level1.level2.level3");
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with levels");
-        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"false");
+        XCTAssertEqualObjects(labels[@"navigation_level_1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"navigation_level_2"], @"Level2");
+        XCTAssertEqualObjects(labels[@"navigation_level_3"], @"Level3");
+        XCTAssertNil(labels[@"navigation_level_4"]);
+        XCTAssertEqualObjects(labels[@"content_title"], @"Automatic tracking with levels");
+        XCTAssertEqualObjects(labels[@"page_id"], @"level1.level2.level3.automatic-tracking-with-levels");
         return YES;
     }];
     
@@ -120,23 +110,21 @@ - (void)testAutomaticTrackingWithLevels
 - (void)testMaximumNumberOfLevels
 {
     // The SRG standard only has srg_nX fields up to 10. The full hierarchy is still obtained from the name and category labels, though
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.level3.level4.level5.level6.level7.level8.level9.level10.level11.level12.automatic-tracking-with-many-levels");
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
-        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
-        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
-        XCTAssertEqualObjects(labels[@"srg_n3"], @"Level3");
-        XCTAssertEqualObjects(labels[@"srg_n4"], @"Level4");
-        XCTAssertEqualObjects(labels[@"srg_n5"], @"Level5");
-        XCTAssertEqualObjects(labels[@"srg_n6"], @"Level6");
-        XCTAssertEqualObjects(labels[@"srg_n7"], @"Level7");
-        XCTAssertEqualObjects(labels[@"srg_n8"], @"Level8");
-        XCTAssertEqualObjects(labels[@"srg_n9"], @"Level9");
-        XCTAssertEqualObjects(labels[@"srg_n10"], @"Level10");
-        XCTAssertNil(labels[@"srg_n11"]);
-        XCTAssertEqualObjects(labels[@"category"], @"level1.level2.level3.level4.level5.level6.level7.level8.level9.level10.level11.level12");
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with many levels");
-        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"false");
+        XCTAssertEqualObjects(labels[@"navigation_level_1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"navigation_level_2"], @"Level2");
+        XCTAssertEqualObjects(labels[@"navigation_level_3"], @"Level3");
+        XCTAssertEqualObjects(labels[@"navigation_level_4"], @"Level4");
+        XCTAssertEqualObjects(labels[@"navigation_level_5"], @"Level5");
+        XCTAssertEqualObjects(labels[@"navigation_level_6"], @"Level6");
+        XCTAssertEqualObjects(labels[@"navigation_level_7"], @"Level7");
+        XCTAssertEqualObjects(labels[@"navigation_level_8"], @"Level8");
+        XCTAssertNil(labels[@"navigation_level_9"]);
+        XCTAssertNil(labels[@"navigation_level_10"]);
+        XCTAssertNil(labels[@"navigation_level_11"]);
+        XCTAssertEqualObjects(labels[@"content_title"], @"Automatic tracking with many levels");
+        XCTAssertEqualObjects(labels[@"page_id"], @"level1.level2.level3.level4.level5.level6.level7.level8.level9.level10.level11.level12.automatic-tracking-with-many-levels");
         return YES;
     }];
     
@@ -148,18 +136,16 @@ - (void)testMaximumNumberOfLevels
     [tester waitForTimeInterval:2.];
 }
 
-- (void)testAutomaticTrackingWithLevelsAndCustomLabels
+- (void)testAutomaticTrackingWithLevelsAndLabels
 {
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"name"], @"level1.level2.automatic-tracking-with-levels-and-custom-labels");
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
-        XCTAssertEqualObjects(labels[@"srg_n1"], @"Level1");
-        XCTAssertEqualObjects(labels[@"srg_n2"], @"Level2");
-        XCTAssertNil(labels[@"srg_n3"]);
-        XCTAssertEqualObjects(labels[@"category"], @"level1.level2");
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Automatic tracking with levels and custom labels");
-        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"false");
+        XCTAssertEqualObjects(labels[@"navigation_level_1"], @"Level1");
+        XCTAssertEqualObjects(labels[@"navigation_level_2"], @"Level2");
+        XCTAssertNil(labels[@"navigation_level_3"]);
+        XCTAssertEqualObjects(labels[@"content_title"], @"Automatic tracking with levels and labels");
         XCTAssertEqualObjects(labels[@"custom_label"], @"custom_value");
+        XCTAssertEqualObjects(labels[@"page_id"], @"level1.level2.automatic-tracking-with-levels-and-labels");
         return YES;
     }];
     
@@ -173,14 +159,11 @@ - (void)testAutomaticTrackingWithLevelsAndCustomLabels
 
 - (void)testManualTracking
 {
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"name"], @"app.manual-tracking");
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"0");
-        XCTAssertEqualObjects(labels[@"srg_n1"], @"app");
-        XCTAssertNil(labels[@"srg_n2"]);
-        XCTAssertEqualObjects(labels[@"category"], @"app");
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Manual tracking");
-        XCTAssertEqualObjects(labels[@"ns_type"], @"view");
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"false");
+        XCTAssertEqualObjects(labels[@"navigation_property_type"], @"app");
+        XCTAssertEqualObjects(labels[@"content_title"], @"Manual tracking");
+        XCTAssertEqualObjects(labels[@"page_id"], @"app.manual-tracking");
         return YES;
     }];
     
@@ -196,7 +179,7 @@ - (void)testManualTracking
 
 - (void)testMissingTitle
 {
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForName:SRGAnalyticsComScoreRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForName:SRGAnalyticsRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) {
         XCTFail(@"No event must be sent when the title is empty");
     }];
     
@@ -214,9 +197,8 @@ - (void)testMissingTitle
 
 - (void)testFromPushNotification
 {
-    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"srg_ap_push"], @"1");
-        XCTAssertNotNil(labels[@"srg_test"]);
+    [self expectationForViewEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"accessed_after_push_notification"], @"true");
         return YES;
     }];
     
diff --git a/Documentation/Getting-started.md b/Documentation/Getting-started.md
index 7aa2a45c..0d8f0043 100644
--- a/Documentation/Getting-started.md
+++ b/Documentation/Getting-started.md
@@ -4,47 +4,53 @@ Getting started
 The SRG Analytics library is made of several frameworks:
 
 * A main `SRGAnalytics.framework` which supplies the singleton responsible of gathering measurements (tracker).
-* A companion optional `SRGAnalytics_MediaPlayer.framework` responsible of stream measurements for applications using our [SRG Media Player library](https://github.com/SRGSSR/SRGMediaPlayer-iOS).
-* A companion optional `SRGAnalytics_DataProvider.framework` transparently forwarding analytics labels received when using our [SRG Data Provider library](https://github.com/SRGSSR/srgdataprovider-ios).
+* A companion optional `SRGAnalytics_MediaPlayer.framework` responsible of stream measurements for applications using our [SRG MediaPlayer library](https://github.com/SRGSSR/SRGMediaPlayer-iOS).
+* A companion optional `SRGAnalytics_DataProvider.framework` transparently forwarding stream measurement analytics labels received from Integration Layer services by the [SRG DataProvider library](https://github.com/SRGSSR/srgdataprovider-ios).
 
 ## Starting the tracker
 
-Before measurements can be collected, the tracker singleton responsible of all analytics data gathering must be started. You should start the tracker as soon as possible, usually in your application delegate `-application:didFinishLaunchingWithOptions:` method implementation. For example:
+Before measurements can be collected, the tracker singleton responsible of all analytics data gathering must be started. You should start the tracker as soon as possible, usually in your application delegate `-application:didFinishLaunchingWithOptions:` method implementation. Startup requires a single configuration parameter to be provided:
 
 ```objective-c
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // ...
-
-    [[SRGAnalyticsTracker sharedTracker] startWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
-                                                     comScoreVirtualSite:@"srg-vsite"
-                                                     netMetrixIdentifier:@"srf-app-identifier"];
+    
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
+                                                                                                       container:3
+                                                                                             comScoreVirtualSite:@"srf-vsite"
+                                                                                             netMetrixIdentifier:@"srf-app-identifier"];
+    [[SRGAnalyticsTracker sharedTracker] startWithConfiguration:configuration];
                                                      
     // ...
 }
 ```
 
-Once the tracker has been started, you can perform measurements. You can use the special `SRGAnalyticsBusinessUnitIdentifierTEST` for tests or during development to avoid polluting real application measurements.
+The various setup parameters to use must be obtained by the team responsible of measurements for your application. You must set the configuration `centralized` boolean to `YES` if measurements for your application are analyzed by the SRG SSR General direction. 
+
+For unit tests, you can also set the `unitTesting` flag to emit notifications which can be used to check when analytics information is sent, and whether it is correct.
+
+Once the tracker has been started, you can perform measurements.
 
 ## Measurement information
 
-Measurement information is often referred to as labels. Labels are plain dictionaries of string keys and values. Part of the information sent in events follows SRG measurement guidelines and is handled internally, but you can add arbitrary information for your own measurement purposes, if needed (see below how this is done for the various events your application can generate).
+Measurement information, often referred to as labels, is provided in the form of dictionaries mapping strings to strings. Part of the information sent in events follows SRG measurement guidelines and is handled internally, but you can add arbitrary information for your own measurement purposes if needed (see below how this is done for the various events your application can generate).
 
-Be careful when using custom labels, though, and ensure your custom keys do not match reserved values by using appropriate naming conventions (e.g. a prefix).
+Be careful when using custom labels, though, and ensure your custom keys do not match reserved values by using appropriate naming conventions (e.g. a prefix). Also check with the measurement team whether the custom labels you are using is supported.
 
 ## Measuring page views
 
 View controllers represent the units of screen interaction in an application, this is why page view measurements are primarily made on view controllers. All methods and protocols for view controller tracking have been gathered in the `UIViewController+SRGAnalytics.h` file.
 
-View controller measurement is an opt-in, in other words no view controller is tracked by default. For a view controller to be tracked, you need to have it conform to the `SRGAnalyticsViewTracking` protocol. This protocol requires a single method to be implemented, returning the view controller name to be used for measurements. By default, once a view controller implements the `SRGAnalyticsViewTracking` protocol, it automatically generates a page view when it did appear on screen (after insertion into the view controller hierarchy), or if it is already displayed when the application wakes up from background.
+View controller measurement is an opt-in, in other words no view controller is tracked by default. For a view controller to be tracked, the recommended approach is to have it conform to the `SRGAnalyticsViewTracking` protocol. This protocol requires a single method to be implemented, returning the view controller title to be used for measurements. By default, once a view controller implements the `SRGAnalyticsViewTracking` protocol, it automatically generates a page view when it appears on screen, or when the application wakes up from background with the view controller displayed.
 
-The `SRGAnalyticsViewTracking` protocol supplies optional methods to specify other custom measurement information (labels). If this information (or the title to be used) is not available when the view controller appears, you can disable automatic tracking by implementing the optional `-srg_isTrackedAutomatically` protocol method, returning `NO`. You are then responsible of calling `-trackPageView` on the view controller when you want to perform measurements.
+The `SRGAnalyticsViewTracking` protocol supplies optional methods to specify other custom measurement information (labels). If the required information is not available when the view controller appears, you can disable automatic tracking by implementing the optional `-srg_isTrackedAutomatically` protocol method, returning `NO`. You are then responsible of calling `-trackPageView` on the view controller when the data required by the page view is available.
 
 If a view can be opened from a push notification, you must implement the `-srg_openedFromPushNotification` method and return `YES` when the view controller was actually opened from a push notification.
 
 #### Remark
 
-If your application needs to track views instead of view controllers, you can still perform tracking using the `-[SRGAnalyticsTracker trackPageViewTitle:levels:customLabels:fromPushNotification:]` method.
+If your application needs to track views instead of view controllers, you can still perform tracking using the `-[SRGAnalyticsTracker trackPageViewWithTitle:levels:labels:fromPushNotification:]` method.
 
 ### Example
 
@@ -67,9 +73,13 @@ and implement the methods you need to supply measurement information:
     return @"home";
 }
 
-- (NSDictionary<NSString *, NSString *> *)srg_pageViewCustomLabels
+- (SRGAnalyticsPageViewLabels *)srg_pageViewLabels
 {
-    return @{ @"myapp_category" : @"general" };
+    SRGAnalyticsPageViewLabels *labels = [[SRGAnalyticsPageViewLabels alloc] init];
+    labels.customInfo = @{ @"MYAPP_CATEGORY" : @"general",
+                           @"MYAPP_TIME" : @"1499319314" };
+    labels.comScoreCustomInfo = @{ @"myapp_category" : @"gen" };
+    return labels;
 }
 
 @end
@@ -77,26 +87,28 @@ and implement the methods you need to supply measurement information:
 
 When the view is opened or if the view is visible on screen when waking up the application, this information will be automatically sent.
 
+Note that the labels might differ depending on the service they are sent to. Be sure to apply the conventions required for measurements of your application. Moreover, custom information requires the corresponding variables to be defined for TagCommander first (unlike comScore information which can be freely defined).
+
 ## Measuring application functionalities
 
-To measure the use of other application functionalities, you can use hidden events. Those can be emitted by calling the corresponding methods on the tracker singleton itself. For example, you could send the following event when the user taps on a video full-screen button within your application:
+To measure any kind of application functionality, you can use hidden events. Those can be emitted by calling the corresponding methods on the tracker singleton itself. For example, you could send the following event when the user taps on a player full-screen button within your application:
 
 ```objective-c
-[[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithTitle:@"full-screen" customLabels:@{ @"myapp_enabled" : @"true" }];
+[[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"full-screen"];
 ```
 
-Custom labels can be used to send any additional measurement information you could need.
+Custom labels can also be used to send any additional measurement information you could need, and which might be different for TagCommander and comScore.
 
-## Measuring media consumption
+## Measuring SRG MediaPlayer media consumption
 
-To measure media consumption, you need to add the `SRGAnalytics_MediaPlayer.framework` companion framework to your project. As soon the framework has been added, it starts tracking any `SRGMediaPlayerController` instance by default. 
+To measure media consumption for [SRG MediaPlayer](https://github.com/SRGSSR/SRGMediaPlayer-iOS) controllers, you need to add the `SRGAnalytics_MediaPlayer.framework` companion framework to your project. As soon the framework has been added, it starts tracking any `SRGMediaPlayerController` instance by default. 
 
 You can disable tracking by setting the `SRGMediaPlayerController` `tracked` property to `NO`. If you don't want the player to send any media playback events, you should perform this setup before actually beginning playback. You can still toggle the property on or off at any time if needed.
 
 Two levels of measurement information (labels) can be provided:
 
 * Labels associated with the content being played, and which can be supplied when playing the media. Dedicated methods are available from `SRGMediaPlayerController+SRGAnalytics.h`.
-* Labels associated with a segment being played, and which are supplied by having segments implement the `SRGAnalyticsSegment` protocol instead of `SRGSegment`.
+* Labels associated with a segment being played, and which are supplied by having segments implement the `SRGAnalyticsSegment` protocol.
 
 When playing a segment, segment labels are superimposed to content labels. You can therefore decide to selectively override content labels by having segments return labels with matching names, if needed. 
 
@@ -117,9 +129,12 @@ You could have a segment return the following information:
 
 @implementation Segment
 
-- (NSDictionary<NSString *, NSString *> *)srg_analyticsLabels
+- (SRGAnalyticsPlayerLabels *)srg_analyticsLabels
 {
-    return @{ @"myapp_media_id" : self.name };
+    SRGAnalyticsPlayerLabels *labels = [[SRGAnalyticsPlayerLabels alloc] init];
+    labels.customInfo = @{ @"MYAPP_MEDIA_ID" : self.name };
+    labels.comScoreCustomInfo = @{ @"myapp_media_id" : self.name };
+    return labels;
 }
 
 // ...
@@ -128,44 +143,79 @@ You could have a segment return the following information:
 
 ```
 
-and play the content with the following labels:
+and play some content, associating measurement labels with it:
 
 ```objective-c
 Segment *segment = [[Segment alloc] initWithName:@"Subject" timeRange:...];
 NSURL *URL = ...;
 
+SRGAnalyticsPlayerLabels *labels = [[SRGAnalyticsPlayerLabels alloc] init];
+labels.customInfo = @{ @"MYAPP_MEDIA_ID" : @"My media". @"MYAPP_PRODUCER" : @"RTS" };
+labels.comScoreCustomInfo = @{ @"myapp_media_id" : self.name };
+
 SRGMediaPlayerController *mediaPlayerController = [[SRGMediaPlayerController alloc] init];
-[mediaPlayerController playURL:URL atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"myapp_media_id" : @"My media". @"myapp_producer" : @"RTS" } userInfo:nil];
+[mediaPlayerController playURL:URL 
+                        atTime:kCMTimeZero 
+                  withSegments:@[segment] 
+               analyticsLabels:labels
+                      userInfo:nil];
 ```
 
-When playing the content, tracking information will contain:
+When playing the content, tracking information sent to TagCommander will contain:
 
 ```
-myapp_media_id = My media
-myapp_producer = RTS
+MYAPP_MEDIA_ID = My media
+MYAPP_PRODUCER = RTS
 ```
 
 but when playing the segment (after the user selects it), this information will be overridden as follows:
 
 ```
-myapp_media_id = Subject
-myapp_producer = RTS
+MYAPP_MEDIA_ID = Subject
+MYAPP_PRODUCER = RTS
 ```
 
-## Automatic media consumption measurement labels using SRG SSR data provider library
+The mechanism is the same for information sent to comScore.
 
-Our services directly supply the custom analytics labels which need to be sent to the analytics services when tracking media consumption. If you are using [our data provider library](https://github.com/SRGSSR/srgdataprovider-ios) to connect to our services, be sure to add the `SRGAnalytics_SRGDataProvider.framework` companion framework to your project as well, which will take care of this process for you.
+## Automatic media consumption measurement labels using the SRG DataProvider library
 
-This framework adds a category `SRGMediaPlayerController (SRGAnalytics_DataProvider)`, which adds playback methods for media compositions to `SRGMediaPlayerController`. To play a media composition retrieved from an `SRGDataProvider`, simply call:
+Our services directly supply the custom analytics labels which need to be sent with media consumption measurements. If you are using our [SRG DataProvider library](https://github.com/SRGSSR/srgdataprovider-ios) in your application, be sure to add the `SRGAnalytics_SRGDataProvider.framework` companion framework to your project as well, which will take care of all the process for you.
+
+This framework adds a category `SRGMediaPlayerController (SRGAnalytics_DataProvider)`, which adds playback methods for media compositions to `SRGMediaPlayerController`. To play a media composition retrieved from an `SRGDataProvider` and have all measurement information automatically associated with the playback, simply call:
 
 ```objective-c
 SRGRequest *request = [mediaPlayerController playMediaComposition:mediaComposition withPreferredStreamingMethod:SRGStreamingMethodHLS quality:SRGQualityHD startBitRate:0 userInfo:nil resume:YES completionHandler:^(NSError * _Nonnull error) {
     // Deal with errors, or play the URL with a media player
 }];
 ```
+
 on an `SRGMediaPlayerController` instance. Note that the play method returns an `SRGRequest` which must be resumed so that a token is retrieved before attempting to play the media.
 
-Nothing more is required for correct media consumption measurements. During playback, all analytics labels for the content and its segments are then transparently managed for you.
+Nothing more is required for correct media consumption measurements. During playback, all analytics labels for the content and its segments will be transparently managed for you.
+
+## Measurements of other media players
+
+If your application cannot use [SRG MediaPlayer](https://github.com/SRGSSR/SRGMediaPlayer-iOS) for media playback, you must implement media streaming measurements manually. To track playback for a media, instantiate an `SRGAnalyticsStreamTracker` object and retain it somewhere during media playback. 
+
+```objective-c
+self.streamTracker = [[SRGAnalyticsStreamTracker alloc] initWithLivestream:NO];
+```
+
+The initializer requires a livestream parameter, specifying whether the stream is a livestream or not. This distinction is important, as measurements are performed slightly differently for livestreams. The tracker must therefore only be instantiated once this information is known.
+
+When the state of the playback changes, call the update method available from the stream tracker public interface, specifying information about the new state of the stream. When transitions occur on the basis of this state information, the tracker automatically generates streaming measurements transparently. You should therefore update the state of your player when it changes, so that the tracker can keep an accurate picture of the stream state.
+
+For example, you can declare that the stream is being played at the 6th second by calling:
+
+```objective-c
+[self.streamTracker updateWithStreamState:SRGAnalyticsPlayerStatePlaying
+                                 position:6000
+                                   labels:nil];
+```
+
+When using this lower-level API, you are responsible of following SRG SSR guidelines for playback measurements. For example, you need to supply correct segment labels if the user has chosen to play a specific part of your media (none in the example above). Read [our internal documentation](https://srfmmz.atlassian.net/wiki/spaces/INTFORSCHUNG/pages/195595938/Implementation+Concept+-+draft) for more information.
+
+Correctly conforming to all SRG SSR guidelines is not a trivial task, though. Please contact us if you need help in implementing correct stream statistics for a custom player.
 
 ## Thread-safety
 
diff --git a/Documentation/Migration-guide.md b/Documentation/Migration-guide.md
index 551f0a89..4e05c0bd 100644
--- a/Documentation/Migration-guide.md
+++ b/Documentation/Migration-guide.md
@@ -1,4 +1,33 @@
-Migrating from version 1.x to version 2
+Migrating from version 2 to version 3
+=======================================
+
+Version 3 of the SRG Analytics library introduces TagCommander support, as well as breaking changes requiring you to migrate your existing code base.
+
+## Dependencies
+
+TagCommander `TCCore.framework` and `TCSDK.framework` now need to be linked with your project.
+
+## Tracker initialization
+
+Tracker setup is now performed via a configuration object. A container identifier is required for TagCommander measurements. Contact your measurement team for more information about which one your application must use.
+
+## Labels
+
+You need to migrate custom data you previously sent to comScore so that it is now sent to TagCommander. 
+
+Since TagCommander requires variables to be explicitly defined on its portal to collect the associated data, you might need to discuss custom labels you previously used with your measurement team. 
+
+In particular, hidden events are therefore now provided with three predefined variables (type, value and source) which you should now use most of the time to convey custom data. There is still possibility to send arbitrary values to TagCommander, but those need to be discussed with your measurement team first.
+
+## comScore to TagCommander transition
+
+During the initial comScore to TagCommander transition, both services will coexist. Labels you currently send to comScore must therefore still be transmitted during the transition phase, so that analysts can check the consistency of the reports they produce.
+
+New label classes `SRGAnalyticsHiddenEventLabels` and `SRGAnalyticsPageViewLabels` have been introduced to send this information to both services with a single unified formalism. All tracking methods and protocols have been updated and now work with such objects instead of the raw dictionaries used in version 2.
+
+When the transition is complete, a minor version of the SRG Analytics library will be released, at which point you will be able to remove all comScore-related logic from your project.
+
+Migrating from version 1 to version 2
 =======================================
 
 Version 2 of the SRG Analytics library introduces several changes which require you to migrate your existing code base. 
diff --git a/Framework/SRGAnalytics.h b/Framework/SRGAnalytics.h
index c1a16a33..1e70138c 100644
--- a/Framework/SRGAnalytics.h
+++ b/Framework/SRGAnalytics.h
@@ -10,6 +10,8 @@
 FOUNDATION_EXPORT NSString * SRGAnalyticsMarketingVersion(void);
 
 // Public headers.
+#import "SRGAnalyticsConfiguration.h"
 #import "SRGAnalyticsNotifications.h"
+#import "SRGAnalyticsStreamTracker.h"
 #import "SRGAnalyticsTracker.h"
 #import "UIViewController+SRGAnalytics.h"
diff --git a/Framework/Sources/Core/SRGAnalyticsConfiguration.h b/Framework/Sources/Core/SRGAnalyticsConfiguration.h
new file mode 100644
index 00000000..97d2e337
--- /dev/null
+++ b/Framework/Sources/Core/SRGAnalyticsConfiguration.h
@@ -0,0 +1,98 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ *  @name Supported business units
+ */
+typedef NSString * SRGAnalyticsBusinessUnitIdentifier NS_STRING_ENUM;
+
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRSI;
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTR;
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTS;
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSRF;
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSRG;
+OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSWI;
+
+@interface SRGAnalyticsConfiguration : NSObject <NSCopying>
+
+/**
+ *  Create a measurement configuration. Check with the team responsible for measurements of your application to get 
+ *  the correct settings to use for your application.
+ *
+ *  @param businessUnitIdentifier The identifier of the business unit which measurements are made for. Usually the
+ *                                business unit which publishes the application.
+ *  @param container              The TagCommander container identifier to which measurements will be sent.
+ *  @param comScoreVirtualSite    The comScore virtual site to which measurements must be sent.
+ *  @param netMetrixIdenfifier    The NetMetrix application identifier to send measurements for.
+ */
+- (instancetype)initWithBusinessUnitIdentifier:(SRGAnalyticsBusinessUnitIdentifier)businessUnitIdentifier
+                                     container:(NSInteger)container
+                           comScoreVirtualSite:(NSString *)comScoreVirtualSite
+                           netMetrixIdentifier:(NSString *)netMetrixIdentifier;
+
+/**
+ *  Set to `YES` if measurements are studied by the General SRG SSR Direction, or to `NO` if the business
+ *  unit itself will perform the studies.
+ *
+ *  Default value is `NO`.
+ */
+@property (nonatomic, getter=isCentralized) BOOL centralized;
+
+/**
+ *  Set to `YES` to unit test measurements.
+ *
+ *  Default value is `NO`.
+ *
+ *  @discussion When unit testing is enabled, notifications are emitted so that unit tests can verify what information is
+ *              being sent and when. In addition:
+ *                - TagCommander service calls will be disabled, and the heartbeat will be reduced to 3 seconds.
+ *                - NetMetrix and comScore service calls will be disabled.
+ */
+@property (nonatomic, getter=isUnitTesting) BOOL unitTesting;
+
+/**
+ *  The SRG SSR business unit which measurements are associated with.
+ */
+@property (nonatomic, readonly, copy) SRGAnalyticsBusinessUnitIdentifier businessUnitIdentifier;
+
+/**
+ *  The TagCommander site.
+ */
+@property (nonatomic, readonly) NSInteger site;
+
+/**
+ *  The TagCommander container identifier.
+ */
+@property (nonatomic, readonly) NSInteger container;
+
+/**
+ *  The comScore virtual site to which measurements must be sent. By default `business_unit-app-test-v`.
+ */
+@property (nonatomic, readonly, copy) NSString *comScoreVirtualSite;
+
+/**
+ *  The NetMetrix domain.
+ */
+@property (nonatomic, readonly, copy, nullable) NSString *netMetrixDomain;
+
+/**
+ *  The NetMetrix application identifier.
+ */
+@property (nonatomic, readonly, copy) NSString *netMetrixIdentifier;
+
+@end
+
+@interface SRGAnalyticsConfiguration (Unavailable)
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Framework/Sources/Core/SRGAnalyticsConfiguration.m b/Framework/Sources/Core/SRGAnalyticsConfiguration.m
new file mode 100644
index 00000000..e09c5977
--- /dev/null
+++ b/Framework/Sources/Core/SRGAnalyticsConfiguration.m
@@ -0,0 +1,98 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGAnalyticsConfiguration.h"
+
+@interface SRGAnalyticsConfiguration ()
+
+@property (nonatomic, copy) SRGAnalyticsBusinessUnitIdentifier businessUnitIdentifier;
+@property (nonatomic) NSInteger container;
+@property (nonatomic, copy) NSString *comScoreVirtualSite;
+@property (nonatomic, copy) NSString *netMetrixIdentifier;
+
+@end
+
+@implementation SRGAnalyticsConfiguration
+
+#pragma mark Object lifecycle
+
+- (instancetype)initWithBusinessUnitIdentifier:(SRGAnalyticsBusinessUnitIdentifier)businessUnitIdentifier
+                                     container:(NSInteger)container
+                           comScoreVirtualSite:(NSString *)comScoreVirtualSite
+                           netMetrixIdentifier:(NSString *)netMetrixIdentifier
+{
+    if (self = [super init] ) {
+        self.businessUnitIdentifier = businessUnitIdentifier;
+        self.container = container;
+        self.comScoreVirtualSite = comScoreVirtualSite;
+        self.netMetrixIdentifier = netMetrixIdentifier;
+    }
+    return self;
+}
+
+#pragma mark Getters and setters
+
+- (NSInteger)site
+{
+    static NSDictionary<SRGAnalyticsBusinessUnitIdentifier, NSNumber *> *s_sites = nil;
+    static dispatch_once_t s_onceToken;
+    dispatch_once(&s_onceToken, ^{
+        s_sites = @{ SRGAnalyticsBusinessUnitIdentifierRSI : @3668,
+                                  SRGAnalyticsBusinessUnitIdentifierRTR : @3666,       // Under the SRG umbrella
+                                  SRGAnalyticsBusinessUnitIdentifierRTS : @3669,
+                                  SRGAnalyticsBusinessUnitIdentifierSRF : @3667,
+                                  SRGAnalyticsBusinessUnitIdentifierSRG : @3666,
+                                  SRGAnalyticsBusinessUnitIdentifierSWI : @3670 };
+    });
+    
+    NSString *businessUnitIdentifier = self.centralized ? SRGAnalyticsBusinessUnitIdentifierSRG : self.businessUnitIdentifier;
+    return s_sites[businessUnitIdentifier].integerValue;
+}
+
+- (NSString *)netMetrixDomain
+{
+    // HTTPs domains as documented here: https://srfmmz.atlassian.net/wiki/display/SRGPLAY/HTTPS+Transition
+    static dispatch_once_t s_onceToken;
+    static NSDictionary<NSString *, NSString *> *s_domains;
+    dispatch_once(&s_onceToken, ^{
+        s_domains = @{ SRGAnalyticsBusinessUnitIdentifierRSI : @"rsi-ssl",
+                       SRGAnalyticsBusinessUnitIdentifierRTR : @"rtr-ssl",
+                       SRGAnalyticsBusinessUnitIdentifierRTS : @"rts-ssl",
+                       SRGAnalyticsBusinessUnitIdentifierSRF : @"sftv-ssl",
+                       SRGAnalyticsBusinessUnitIdentifierSWI : @"sinf-ssl" };
+    });
+    return s_domains[self.businessUnitIdentifier];
+}
+
+#pragma mark NSCopying protocol
+
+- (id)copyWithZone:(NSZone *)zone
+{
+    SRGAnalyticsConfiguration *configuration = [SRGAnalyticsConfiguration new];
+    configuration.businessUnitIdentifier = self.businessUnitIdentifier;
+    configuration.container = self.container;
+    configuration.comScoreVirtualSite = self.comScoreVirtualSite;
+    configuration.netMetrixIdentifier = self.netMetrixIdentifier;
+    configuration.centralized = self.centralized;
+    configuration.unitTesting = self.unitTesting;
+    return configuration;
+}
+
+#pragma mark Description
+
+- (NSString *)description
+{
+    return [NSString stringWithFormat:@"<%@: %p; businessUnitIdentifier: %@; site: %@; container: %@; comScoreVurtualSite: %@; netMetrixIdentifier: %@>",
+            [self class],
+            self,
+            self.businessUnitIdentifier,
+            @(self.site),
+            @(self.container),
+            self.comScoreVirtualSite,
+            self.netMetrixIdentifier];
+}
+
+@end
diff --git a/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.h b/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.h
index 4cfa1d55..5cecc65d 100644
--- a/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.h
+++ b/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.h
@@ -4,6 +4,8 @@
 //  License information is available from the LICENSE file.
 //
 
+#import "SRGAnalyticsConfiguration.h"
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -14,14 +16,13 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SRGAnalyticsNetMetrixTracker : NSObject
 
 /**
- *  Create a tracker sending events for the specified NetMetrix identifier and business unit.
+ *  Create a tracker sending events for the specified configuration.
  *
- *  @param identifier             A unique NetMetrix identifier for the application (e.g. 'SRG-info', 'SRG-sport', 'srgplayer', ...).
- *  @param businessUnitIdentifier The business unit to which events must be associated.
+ *  @param configuration The configuration to use.
  *
  *  @return The Netmetrix tracker.
  */
-- (instancetype)initWithIdentifier:(NSString *)identifier businessUnitIdentifier:(NSString *)businessUnitIdentifier;
+- (instancetype)initWithConfiguration:(SRGAnalyticsConfiguration *)configuration;
 
 /**
  *  Send a view event.
diff --git a/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.m b/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.m
index a74101cc..28b5d953 100644
--- a/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.m
+++ b/Framework/Sources/Core/SRGAnalyticsNetMetrixTracker.m
@@ -14,8 +14,7 @@
 
 @interface SRGAnalyticsNetMetrixTracker ()
 
-@property (nonatomic, copy) NSString *identifier;
-@property (nonatomic, copy) NSString *businessUnitIdentifier;
+@property (nonatomic, copy) SRGAnalyticsConfiguration *configuration;
 
 @end
 
@@ -23,64 +22,52 @@ @implementation SRGAnalyticsNetMetrixTracker
 
 #pragma mark Object lifecycle
 
-- (instancetype)initWithIdentifier:(NSString *)identifier businessUnitIdentifier:(NSString *)businessUnitIdentifier
+- (instancetype)initWithConfiguration:(SRGAnalyticsConfiguration *)configuration
 {
     if (self = [super init]) {
-        self.identifier = identifier;
-        self.businessUnitIdentifier = businessUnitIdentifier;
+        self.configuration = configuration;
     }
     return self;
 }
 
-#pragma mark Getters and setters
-
-- (NSString *)netMetrixDomain
-{
-    // HTTPs domains as documented here: https://srfmmz.atlassian.net/wiki/display/SRGPLAY/HTTPS+Transition
-    static dispatch_once_t s_onceToken;
-    static NSDictionary<NSString *, NSString *> *s_domains;
-    dispatch_once(&s_onceToken, ^{
-        s_domains = @{ SRGAnalyticsBusinessUnitIdentifierRSI : @"rsi-ssl",
-                       SRGAnalyticsBusinessUnitIdentifierRTR : @"rtr-ssl",
-                       SRGAnalyticsBusinessUnitIdentifierRTS : @"rts-ssl",
-                       SRGAnalyticsBusinessUnitIdentifierSRF : @"sftv-ssl",
-                       SRGAnalyticsBusinessUnitIdentifierSWI : @"sinf-ssl" };
-    });
-    return s_domains[self.businessUnitIdentifier] ?: self.businessUnitIdentifier;
-}
-
 #pragma mark View tracking
 
 - (void)trackView
 {
-    NSString *netMetrixURLString = [NSString stringWithFormat:@"https://%@.wemfbox.ch/cgi-bin/ivw/CP/apps/%@/ios/%@", self.netMetrixDomain, self.identifier, self.device];
-    NSURL *netMetrixURL = [NSURL URLWithString:netMetrixURLString];
-    
-    if ([self.businessUnitIdentifier isEqualToString:SRGAnalyticsBusinessUnitIdentifierTEST]) {
-        // Send the notification when the request is made (as is done with comScore). Notifications are intended to test
-        // whether events are properly sent, not whether they are properly received
-        [[NSNotificationCenter defaultCenter] postNotificationName:SRGAnalyticsNetmetrixRequestNotification
-                                                            object:nil
-                                                          userInfo:@{ SRGAnalyticsNetmetrixURLKey : netMetrixURL }];
+    SRGAnalyticsConfiguration *configuration = self.configuration;
+    NSString *netMetrixDomain = configuration.netMetrixDomain;
+    if (! netMetrixDomain) {
+        SRGAnalyticsLogInfo(@"NetMetrix", @"No NetMetrix domain is defined for this configuration. No event will be recorded");
+        return;
     }
     
-    if (! [self.businessUnitIdentifier isEqualToString:SRGAnalyticsBusinessUnitIdentifierTEST]) {
-        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:netMetrixURL cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:30.];
+    NSString *netMetrixURLString = [NSString stringWithFormat:@"https://%@.wemfbox.ch/cgi-bin/ivw/CP/apps/%@/ios/%@", netMetrixDomain, configuration.netMetrixIdentifier, self.device];
+    NSURL *netMetrixURL = [NSURL URLWithString:netMetrixURLString];
+    
+    if (! configuration.unitTesting) {
+        NSURLComponents *URLComponents = [NSURLComponents componentsWithURL:netMetrixURL resolvingAgainstBaseURL:NO];
+        URLComponents.queryItems = @[ [NSURLQueryItem queryItemWithName:@"d" value:@(arc4random()).stringValue] ];
+        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URLComponents.URL cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:30.];
         [request setHTTPMethod:@"GET"];
         [request setValue:@"image/gif" forHTTPHeaderField:@"Accept"];
         
-        // Which User-Agent MUST be used is defined on http://www.net-metrix.ch/fr/produits/net-metrix-mobile/reglement/directives
-        NSString *systemVersion = [[[UIDevice currentDevice] systemVersion] stringByReplacingOccurrencesOfString:@"." withString:@"_"];
-        NSString *userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (iOS-%@; CPU %@ %@ like Mac OS X)", self.device, self.operatingSystem, systemVersion];
+        // Which User-Agent MUST be used is defined at https://www.net-metrix.ch/fr/service/directives/directives-supplementaires-pour-les-applications
+        NSString *userAgent = [NSString stringWithFormat:@"Mozilla/5.0 (iOS-%@; U; CPU %@ like Mac OS X)", self.device, self.operatingSystem];
         [request setValue:userAgent forHTTPHeaderField:@"User-Agent"];
         
+        // The app language must be sent, not the device language. This is sadly not documented in https://www.net-metrix.ch/fr/service/directives/directives-supplementaires-pour-les-applications,
+        // but this information was obtained from a NetMetrix technician.
+        [request setValue:[NSBundle mainBundle].preferredLocalizations.firstObject forHTTPHeaderField:@"Accept-Language"];
+        
         SRGAnalyticsLogDebug(@"NetMetrix", @"Request %@ started", request.URL);
         [[[NSURLSession sharedSession] dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
             SRGAnalyticsLogDebug(@"NetMetrix", @"Request %@ ended with error %@", request.URL, error);
         }] resume];
     }
     else {
-        SRGAnalyticsLogDebug(@"NetMetrix", @"Requests are disabled for the test business unit");
+        [[NSNotificationCenter defaultCenter] postNotificationName:SRGAnalyticsNetmetrixRequestNotification
+                                                            object:nil
+                                                          userInfo:@{ SRGAnalyticsNetmetrixURLKey : netMetrixURL }];
     }
 }
 
diff --git a/Framework/Sources/Core/SRGAnalyticsNotifications.h b/Framework/Sources/Core/SRGAnalyticsNotifications.h
index 4d53c784..11ee442f 100644
--- a/Framework/Sources/Core/SRGAnalyticsNotifications.h
+++ b/Framework/Sources/Core/SRGAnalyticsNotifications.h
@@ -9,12 +9,19 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  The following notifications can be used if you need to track when comScore and NetMetrix requests are made, 
- *  and which information is actually sent to these services. These notifications are only emitted when the
- *  business unit identifier has been set to `SRGAnalyticsBusinessUnitIdentifierTEST`, and are therefore only
- *  suitable for test setups.
+ *  The following notifications can be used if you need to track when TagCommander, comScore and NetMetrix 
+ *  requests are made, and which information will be sent to these services, for unit testing purposes. 
+ *
+ *  These notifications are only emitted when enabling the `unitTesting` tracker configuration flag, @see
+ *  `SRGAnalyticsConfiguration`.
  */
 
+// Notification sent when TagCommander analytics are sent.
+OBJC_EXTERN NSString * const SRGAnalyticsRequestNotification;
+
+// Information available for `SRGAnalyticsRequestNotification`.
+OBJC_EXTERN NSString * const SRGAnalyticsLabelsKey;                         // Key for accessing the labels (as an `NSDictionary<NSString *, NSString *>`) available from the user info.
+
 // Notification sent when a request is made to comScore.
 OBJC_EXTERN NSString * const SRGAnalyticsComScoreRequestNotification;
 
diff --git a/Framework/Sources/Core/SRGAnalyticsNotifications.m b/Framework/Sources/Core/SRGAnalyticsNotifications.m
index b35c1344..bc68e66b 100644
--- a/Framework/Sources/Core/SRGAnalyticsNotifications.m
+++ b/Framework/Sources/Core/SRGAnalyticsNotifications.m
@@ -6,6 +6,9 @@
 
 #import "SRGAnalyticsNotifications.h"
 
+NSString * const SRGAnalyticsRequestNotification = @"SRGAnalyticsRequestNotification";
+NSString * const SRGAnalyticsLabelsKey = @"SRGAnalyticsLabelsKey";
+
 NSString * const SRGAnalyticsComScoreRequestNotification = @"SRGAnalyticsComScoreRequestNotification";
 NSString * const SRGAnalyticsComScoreLabelsKey = @"SRGAnalyticsComScoreLabelsKey";
 
diff --git a/Framework/Sources/Core/SRGAnalyticsStreamTracker.h b/Framework/Sources/Core/SRGAnalyticsStreamTracker.h
new file mode 100644
index 00000000..240bad3f
--- /dev/null
+++ b/Framework/Sources/Core/SRGAnalyticsStreamTracker.h
@@ -0,0 +1,199 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Forward declarations
+@class SRGAnalyticsStreamTracker;
+
+/**
+ *  @name Stream states
+ */
+typedef NS_ENUM(NSInteger, SRGAnalyticsStreamState) {
+    /**
+     *  The stream is currently being played.
+     */
+    SRGAnalyticsStreamStatePlaying = 1,
+    /**
+     *  Stream playback is paused.
+     */
+    SRGAnalyticsStreamStatePaused,
+    /**
+     *  The stream is being seeked to another location.
+     */
+    SRGAnalyticsStreamStateSeeking,
+    /**
+     *  The stream playback is stopped.
+     */
+    SRGAnalyticsStreamStateStopped,
+    /**
+     *  Stream playback ended normally.
+     */
+    SRGAnalyticsStreamStateEnded
+};
+
+/**
+ *  Additional stream measurement labels.
+ */
+@interface SRGAnalyticsStreamLabels : NSObject <NSCopying>
+
+/**
+ *  @name Player information
+ */
+
+/**
+ *  The media player display name, e.g. "AVPlayer" if you are using `AVPlayer` directly.
+ */
+@property (nonatomic, copy, nullable) NSString *playerName;
+
+/**
+ *  The media player version.
+ */
+@property (nonatomic, copy, nullable) NSString *playerVersion;
+
+/**
+ *  The volume of the player, on a scale from 0 to 100.
+ *
+ *  @discussion As the name suggests, this value must represent the volume of the player. If the player is not started or
+ *              muted, this value must be set to 0.
+ */
+@property (nonatomic, nullable) NSNumber *playerVolumeInPercent;        // Long
+
+/**
+ *  @name Playback information
+ */
+
+/**
+ *  Set to `@YES` iff subtitles are enabled at the time the measurement is made.
+ */
+@property (nonatomic, nullable) NSNumber *subtitlesEnabled;             // BOOL
+
+/**
+ *  Set to the current positive shift from live conditions, in milliseconds. Must be 0 for live streams without timeshift 
+ *  support, and `nil` for on-demand streams.
+ */
+@property (nonatomic, nullable) NSNumber *timeshiftInMilliseconds;      // Long
+
+/**
+ *  The current bandwidth in bits per second.
+ */
+@property (nonatomic, nullable) NSNumber *bandwidthInBitsPerSecond;     // Long
+
+/**
+ *  @name Custom information
+ */
+
+/**
+ *  Additional custom information, mapping variables to values. See https://srfmmz.atlassian.net/wiki/spaces/INTFORSCHUNG/pages/197019081 
+ *  for a full list of possible variable names.
+ *
+ *  You should rarely need to provide custom information with measurements, as this requires the variable name to be
+ *  declared on TagCommander portal first (otherwise the associated value will be discarded).
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *customInfo;
+
+/**
+ *  Additional custom information to be sent to comScore. See https://srfmmz.atlassian.net/wiki/spaces/SRGPLAY/pages/36077617/Measurement+of+SRG+Player+Apps
+ *  for a full list of possible variable names.
+ *
+ *  @discussion This information is sent in comScore StreamSense.
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *comScoreCustomInfo;
+
+/**
+ *  Additional custom segment information to be sent to comScore. See https://srfmmz.atlassian.net/wiki/spaces/SRGPLAY/pages/36077617/Measurement+of+SRG+Player+Apps
+ *  for a full list of possible variable names.
+ *
+ *  @discussion This information is sent in comScore StreamSense clips.
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *comScoreCustomSegmentInfo;
+
+/**
+ *  Merge the receiver with the provided labels (overriding values defined by it, otherwise keeping available ones).
+ *  Use this method when you need to override full-length labels with more specific segment labels.
+ *
+ *  @discussion Custom value dictionaries are merged as well. If you need to preserve the original object intact,
+ *              start with a copy.
+ */
+- (void)mergeWithLabels:(nullable SRGAnalyticsStreamLabels *)labels;
+
+@end
+
+/**
+ *  Stream tracker delegate.
+ */
+@protocol SRGAnalyticsStreamTrackerDelegate <NSObject>
+
+/**
+ *  Return `YES` iff the stream is being played in live conditions.
+ */
+- (BOOL)streamTrackerIsPlayingLive:(SRGAnalyticsStreamTracker *)tracker;
+
+/**
+ *  The current playback position.
+ */
+- (NSTimeInterval)positionForStreamTracker:(SRGAnalyticsStreamTracker *)tracker;
+
+/**
+ *  Current labels associated with the stream.
+ */
+- (nullable SRGAnalyticsStreamLabels *)labelsForStreamTracker:(SRGAnalyticsStreamTracker *)tracker;
+
+@end
+
+/**
+ *  Tracker for stream playback consumption. This tracker ensures that the stream analytics event sequences are always
+ *  reliable, guaranteeing correct measurements. It also transparently manages heartbeats during playback.
+ *
+ *  When you need to track a new stream playback, simply instantiate an `SRGAnalyticsStreamTracker`, keeping a strong
+ *  reference to it, and call the update method to keep the tracker informed about your player state. You must know
+ *  which kind of stream is being loaded at the time you initiate the tracker, so that the tracker behavior can be
+ *  adjusted appropriately.
+ *
+ *  To have heartbeats managed transparently, attach a delegate to the tracker, and implement the associated protocol
+ *  to return current playback information.
+ *
+ *  Note that implementing media player tracking can be tricky to get right, and should only be required if your player is not based
+ *  on SRG MediaPlayer (e.g. if you use `AVPlayer` directly). Please refer to the official documentation more information:
+ *    https://srfmmz.atlassian.net/wiki/spaces/INTFORSCHUNG/pages/195595938/Implementation+Concept+-+draft
+ */
+@interface SRGAnalyticsStreamTracker : NSObject
+
+/**
+ *  Create a tracker instance.
+ *
+ *  @param livestream Set to `YES` if the stream is a livestream (either purely live or supporting DVR), or to `NO`
+ *                    for on-demand streams.
+ */
+- (instancetype)initForLivestream:(BOOL)livestream;
+
+/**
+ *  The tracker delegate.
+ *
+ *  @discussion No heartbeats are sent if no delegate has been assigned.
+ */
+@property (nonatomic, weak, nullable) id<SRGAnalyticsStreamTrackerDelegate> delegate;
+
+/**
+ *  Update the tracker with the specified stream state and information.
+ *
+ *  @param state    The current player state.
+ *  @param position The current player playback position, in milliseconds.
+ *  @param labels   Additional detailed information.
+ *
+ *  @discussion An stream analytics event is only fired when proper conditions are met. To ensure events are emitted
+ *              appropriately, you should therefore update the tracker when appropriate (e.g. when the player playing
+ *              the stream changes its playback state).
+ */
+- (void)updateWithStreamState:(SRGAnalyticsStreamState)state
+                     position:(NSTimeInterval)position
+                       labels:(nullable SRGAnalyticsStreamLabels *)labels;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Framework/Sources/Core/SRGAnalyticsStreamTracker.m b/Framework/Sources/Core/SRGAnalyticsStreamTracker.m
new file mode 100644
index 00000000..6e8ebc58
--- /dev/null
+++ b/Framework/Sources/Core/SRGAnalyticsStreamTracker.m
@@ -0,0 +1,389 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGAnalyticsStreamTracker.h"
+
+#import "NSBundle+SRGAnalytics.h"
+#import "NSMutableDictionary+SRGAnalytics.h"
+#import "SRGAnalyticsTracker+Private.h"
+
+#import <ComScore/ComScore.h>
+#import <SRGAnalytics/SRGAnalytics.h>
+
+@interface SRGAnalyticsStreamTracker ()
+
+@property (nonatomic, getter=isLivestream) BOOL livestream;
+
+@property (nonatomic) CSStreamSense *streamSense;
+
+@property (nonatomic, getter=isComScoreSessionAlive) BOOL comScoreSessionAlive;
+@property (nonatomic) SRGAnalyticsStreamState previousPlayerState;
+
+@property (nonatomic) NSTimeInterval playbackDuration;
+@property (nonatomic) NSDate *previousPlaybackDurationUpdateDate;
+
+@property (nonatomic) NSTimer *heartbeatTimer;
+@property (nonatomic) NSUInteger heartbeatCount;
+
+@end
+
+@implementation SRGAnalyticsStreamLabels
+
+#pragma mark Getters and setters
+
+- (NSDictionary<NSString *, NSString *> *)labelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary srg_safelySetString:[NSBundle srg_isProductionVersion] ? @"prod" : @"preprod" forKey:@"media_embedding_environment"];
+    
+    [dictionary srg_safelySetString:self.playerName forKey:@"media_player_display"];
+    [dictionary srg_safelySetString:self.playerVersion forKey:@"media_player_version"];
+    [dictionary srg_safelySetString:self.playerVolumeInPercent.stringValue ?: @"0" forKey:@"media_volume"];
+    
+    [dictionary srg_safelySetString:self.subtitlesEnabled.boolValue ? @"true" : @"false" forKey:@"media_subtitles_on"];
+    [dictionary srg_safelySetString:self.timeshiftInMilliseconds ? @(self.timeshiftInMilliseconds.integerValue / 1000).stringValue : nil forKey:@"media_timeshift"];
+    [dictionary srg_safelySetString:self.bandwidthInBitsPerSecond.stringValue forKey:@"media_bandwidth"];
+    
+    if (self.customInfo) {
+        [dictionary addEntriesFromDictionary:self.customInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+- (NSDictionary<NSString *, NSString *> *)comScoreLabelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary srg_safelySetString:@"c" forKey:@"ns_st_it"];
+    [dictionary srg_safelySetString:@"p_app_ios" forKey:@"srg_ptype"];
+    
+    [dictionary srg_safelySetString:self.playerName forKey:@"ns_st_mp"];
+    [dictionary srg_safelySetString:self.playerVersion forKey:@"ns_st_mv"];
+    [dictionary srg_safelySetString:self.playerVolumeInPercent.stringValue ?: @"0" forKey:@"ns_st_vo"];
+    
+    [dictionary srg_safelySetString:self.bandwidthInBitsPerSecond.stringValue forKey:@"ns_st_br"];
+    
+    if (self.comScoreCustomInfo) {
+        [dictionary addEntriesFromDictionary:self.comScoreCustomInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+- (NSDictionary<NSString *, NSString *> *)comScoreSegmentLabelsDictionary
+{
+    NSMutableDictionary <NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary srg_safelySetString:self.timeshiftInMilliseconds.stringValue forKey:@"srg_timeshift"];
+    
+    if (self.comScoreCustomSegmentInfo) {
+        [dictionary addEntriesFromDictionary:self.comScoreCustomSegmentInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+#pragma mark Merging
+
+- (void)mergeWithLabels:(SRGAnalyticsStreamLabels *)labels
+{
+    if (! labels) {
+        return;
+    }
+    
+    if (labels.playerName) {
+        self.playerName = labels.playerName;
+    }
+    if (labels.playerVersion) {
+        self.playerVersion = labels.playerVersion;
+    }
+    if (labels.playerVolumeInPercent) {
+        self.playerVolumeInPercent = labels.playerVolumeInPercent;
+    }
+    
+    if (labels.subtitlesEnabled) {
+        self.subtitlesEnabled = labels.subtitlesEnabled;
+    }
+    if (labels.timeshiftInMilliseconds) {
+        self.timeshiftInMilliseconds = labels.timeshiftInMilliseconds;
+    }
+    if (labels.bandwidthInBitsPerSecond) {
+        self.bandwidthInBitsPerSecond = labels.bandwidthInBitsPerSecond;
+    }
+    
+    NSMutableDictionary *customInfo = [self.customInfo mutableCopy] ?: [NSMutableDictionary dictionary];
+    if (labels.customInfo) {
+        [customInfo addEntriesFromDictionary:labels.customInfo];
+    }
+    self.customInfo = (customInfo.count != 0) ? [customInfo copy] : nil;
+    
+    NSMutableDictionary *comScoreCustomInfo = [self.comScoreCustomInfo mutableCopy] ?: [NSMutableDictionary dictionary];
+    if (labels.comScoreCustomInfo) {
+        [comScoreCustomInfo addEntriesFromDictionary:labels.comScoreCustomInfo];
+    }
+    self.comScoreCustomInfo = (comScoreCustomInfo.count != 0) ? [comScoreCustomInfo copy] : nil;
+    
+    NSMutableDictionary *comScoreCustomSegmentInfo = [self.comScoreCustomSegmentInfo mutableCopy] ?: [NSMutableDictionary dictionary];
+    if (labels.comScoreCustomSegmentInfo) {
+        [comScoreCustomSegmentInfo addEntriesFromDictionary:labels.comScoreCustomSegmentInfo];
+    }
+    self.comScoreCustomSegmentInfo = (comScoreCustomSegmentInfo.count != 0) ? [comScoreCustomSegmentInfo copy] : nil;
+}
+
+#pragma mark NSCopying protocol
+
+- (id)copyWithZone:(NSZone *)zone
+{
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.playerName = self.playerName;
+    labels.playerVersion = self.playerVersion;
+    labels.playerVolumeInPercent = self.playerVolumeInPercent;
+    labels.subtitlesEnabled = self.subtitlesEnabled;
+    labels.timeshiftInMilliseconds = self.timeshiftInMilliseconds;
+    labels.bandwidthInBitsPerSecond = self.bandwidthInBitsPerSecond;
+    labels.customInfo = self.customInfo;
+    labels.comScoreCustomInfo = self.comScoreCustomInfo;
+    labels.comScoreCustomSegmentInfo = self.comScoreCustomSegmentInfo;
+    return labels;
+}
+
+@end
+
+@implementation SRGAnalyticsStreamTracker
+
+#pragma mark Object lifecycle
+
+- (instancetype)initForLivestream:(BOOL)livestream
+{
+    if (self = [super init]) {
+        self.livestream = livestream;
+        
+        // The default keep-alive time interval of 20 minutes is too big. Set it to 9 minutes
+        self.streamSense = [[CSStreamSense alloc] init];
+        [self.streamSense setKeepAliveInterval:9 * 60];
+        
+        self.previousPlayerState = SRGAnalyticsStreamStateEnded;
+    }
+    return self;
+}
+
+- (instancetype)init
+{
+    return [self initForLivestream:NO];
+}
+
+- (void)dealloc
+{
+    self.heartbeatTimer = nil;      // Invalidate timer
+}
+
+#pragma mark Getters and setters
+
+- (void)setHeartbeatTimer:(NSTimer *)heartbeatTimer
+{
+    [_heartbeatTimer invalidate];
+    _heartbeatTimer = heartbeatTimer;
+    self.heartbeatCount = 0;
+}
+
+#pragma mark Tracking
+
+- (void)updateWithStreamState:(SRGAnalyticsStreamState)state
+                     position:(NSTimeInterval)position
+                       labels:(SRGAnalyticsStreamLabels *)labels
+{
+    [self updateTagCommanderWithStreamState:state position:position labels:labels];
+    [self updateComScoreWithStreamState:state position:position labels:labels];
+}
+
+- (void)updateComScoreWithStreamState:(SRGAnalyticsStreamState)state
+                             position:(NSTimeInterval)position
+                               labels:(SRGAnalyticsStreamLabels *)labels
+{
+    // Ensure a play is emitted before events requiring a session to be opened (the comScore SDK does not open sessions
+    // automatically)
+    if (! self.comScoreSessionAlive && (state == SRGAnalyticsStreamStatePaused || state == SRGAnalyticsStreamStateSeeking)) {
+        [self updateComScoreWithStreamState:SRGAnalyticsStreamStatePlaying position:position labels:labels];
+    }
+    
+    static dispatch_once_t s_onceToken;
+    static NSDictionary<NSNumber *, NSNumber *> *s_streamSenseEvents;
+    dispatch_once(&s_onceToken, ^{
+        s_streamSenseEvents = @{ @(SRGAnalyticsStreamStatePlaying) : @(CSStreamSensePlay),
+                                 @(SRGAnalyticsStreamStatePaused) : @(CSStreamSensePause),
+                                 @(SRGAnalyticsStreamStateSeeking) : @(CSStreamSensePause),
+                                 @(SRGAnalyticsStreamStateStopped) : @(CSStreamSenseEnd),
+                                 @(SRGAnalyticsStreamStateEnded) : @(CSStreamSenseEnd) };
+    });
+    
+    NSNumber *eventTypeValue = s_streamSenseEvents[@(state)];
+    if (! eventTypeValue) {
+        return;
+    }
+    
+    [[self.streamSense labels] removeAllObjects];
+    [[labels comScoreLabelsDictionary] enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull object, BOOL * _Nonnull stop) {
+        [self.streamSense setLabel:key value:object];
+    }];
+    
+    // Reset clip labels to avoid inheriting from a previous segment. This does not reset internal hidden comScore labels
+    // (e.g. ns_st_pa), which would otherwise be incorrect
+    [[[self.streamSense clip] labels] removeAllObjects];
+    [[labels comScoreSegmentLabelsDictionary] enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull object, BOOL * _Nonnull stop) {
+        [[self.streamSense clip] setLabel:key value:object];
+    }];
+    
+    if (self.livestream) {
+        position = 0;
+    }
+    
+    CSStreamSenseEventType eventType = eventTypeValue.intValue;
+    [self.streamSense notify:eventType position:position labels:nil /* already set on the stream and clip objects */];
+    
+    if (eventType == CSStreamSensePlay) {
+        self.comScoreSessionAlive = YES;
+    }
+    else if (eventType == CSStreamSenseEnd) {
+        self.comScoreSessionAlive = NO;
+    }
+}
+
+- (void)updateTagCommanderWithStreamState:(SRGAnalyticsStreamState)state
+                                 position:(NSTimeInterval)position
+                                   labels:(SRGAnalyticsStreamLabels *)labels
+{
+    // Ensure a play is emitted before events requiring a session to be opened (the TagCommander SDK does not open sessions
+    // automatically)
+    if (self.previousPlayerState == SRGAnalyticsStreamStateEnded && (state == SRGAnalyticsStreamStatePaused || state == SRGAnalyticsStreamStateSeeking)) {
+        [self updateTagCommanderWithStreamState:SRGAnalyticsStreamStatePlaying position:position labels:labels];
+    }
+    
+    static dispatch_once_t s_onceToken;
+    static NSDictionary<NSNumber *, NSString *> *s_eventUids;
+    static NSDictionary<NSNumber *, NSArray<NSNumber *> *> *s_transitions;
+    dispatch_once(&s_onceToken, ^{
+        s_eventUids = @{ @(SRGAnalyticsStreamStatePlaying) : @"play",
+                         @(SRGAnalyticsStreamStatePaused) : @"pause",
+                         @(SRGAnalyticsStreamStateSeeking) : @"seek",
+                         @(SRGAnalyticsStreamStateStopped) : @"stop",
+                         @(SRGAnalyticsStreamStateEnded) : @"eof" };
+        s_transitions = @{ @(SRGAnalyticsStreamStatePlaying) : @[ @(SRGAnalyticsStreamStatePaused), @(SRGAnalyticsStreamStateSeeking), @(SRGAnalyticsStreamStateStopped), @(SRGAnalyticsStreamStateEnded) ],
+                           @(SRGAnalyticsStreamStatePaused) : @[ @(SRGAnalyticsStreamStatePlaying), @(SRGAnalyticsStreamStateSeeking), @(SRGAnalyticsStreamStateStopped), @(SRGAnalyticsStreamStateEnded) ],
+                           @(SRGAnalyticsStreamStateSeeking) : @[ @(SRGAnalyticsStreamStatePlaying), @(SRGAnalyticsStreamStatePaused), @(SRGAnalyticsStreamStateStopped), @(SRGAnalyticsStreamStateEnded) ],
+                           @(SRGAnalyticsStreamStateStopped) : @[ @(SRGAnalyticsStreamStatePlaying) ],
+                           @(SRGAnalyticsStreamStateEnded) : @[ @(SRGAnalyticsStreamStatePlaying) ] };
+    });
+    
+    // Don't send an unknown action
+    NSString *action = s_eventUids[@(state)];
+    if (! action) {
+        return;
+    }
+    
+    // Don't send an unallowed action
+    if (! [s_transitions[@(self.previousPlayerState)] containsObject:@(state)]) {
+        return;
+    }
+    
+    self.previousPlayerState = state;
+    
+    // Restore the heartbeat timer when transitioning to play again.
+    if (state == SRGAnalyticsStreamStatePlaying) {
+        if (! self.heartbeatTimer) {
+            SRGAnalyticsConfiguration *configuration = [SRGAnalyticsTracker sharedTracker].configuration;
+            NSTimeInterval heartbeatInterval = configuration.unitTesting ? 3. : 30.;
+            self.heartbeatTimer = [NSTimer scheduledTimerWithTimeInterval:heartbeatInterval
+                                                                   target:self
+                                                                 selector:@selector(heartbeat:)
+                                                                 userInfo:nil
+                                                                  repeats:YES];
+        }
+    }
+    // Remove the heartbeat when not playing
+    else {
+        self.heartbeatTimer = nil;
+    }
+    
+    // Override position if it is a livestream
+    if (self.livestream) {
+        position = [self updatedPlaybackDurationWithState:state];
+    }
+    
+    // Send the event
+    [self trackTagCommanderMediaPlayerEventWithUid:action withPosition:position labels:labels];
+}
+
+- (void)trackTagCommanderMediaPlayerEventWithUid:(NSString *)eventUid withPosition:(NSTimeInterval)position labels:(SRGAnalyticsStreamLabels *)labels
+{
+    NSAssert(eventUid.length != 0, @"An event uid is required");
+    
+    NSMutableDictionary<NSString *, NSString *> *fullLabelsDictionary = [NSMutableDictionary dictionary];
+    [fullLabelsDictionary srg_safelySetString:eventUid forKey:@"event_id"];
+    [fullLabelsDictionary srg_safelySetString:@(round(position / 1000)).stringValue forKey:@"media_position"];
+    
+    NSDictionary<NSString *, NSString *> *labelsDictionary = [labels labelsDictionary];
+    if (labelsDictionary) {
+        [fullLabelsDictionary addEntriesFromDictionary:labelsDictionary];
+    }
+    
+    [[SRGAnalyticsTracker sharedTracker] trackTagCommanderEventWithLabels:[fullLabelsDictionary copy]];
+}
+
+#pragma mark Playback duration
+
+- (NSTimeInterval)updatedPlaybackDurationWithState:(SRGAnalyticsStreamState)state
+{
+    NSAssert(self.livestream, @"Duration calculated for livestreams only");
+    
+    if (self.previousPlaybackDurationUpdateDate) {
+        self.playbackDuration -= [self.previousPlaybackDurationUpdateDate timeIntervalSinceNow] * 1000;
+    }
+    
+    if (state == SRGAnalyticsStreamStatePlaying) {
+        self.previousPlaybackDurationUpdateDate = NSDate.date;
+    }
+    else {
+        self.previousPlaybackDurationUpdateDate = nil;
+    }
+    
+    NSTimeInterval playbackDuration = self.playbackDuration;
+    
+    if (state == SRGAnalyticsStreamStateStopped || state == SRGAnalyticsStreamStateEnded) {
+        self.playbackDuration = 0;
+    }
+    
+    return playbackDuration;
+}
+
+#pragma mark Timers
+
+- (void)heartbeat:(NSTimer *)timer
+{
+    NSAssert(self.previousPlayerState == SRGAnalyticsStreamStatePlaying, @"Heartbeat timer is only active when playing by construction");
+    
+    if (self.delegate) {
+        NSTimeInterval position = [self.delegate positionForStreamTracker:self];
+        
+        // Override position if it is a livestream
+        if (self.livestream) {
+            position = [self updatedPlaybackDurationWithState:SRGAnalyticsStreamStatePlaying];
+        }
+        
+        SRGAnalyticsStreamLabels *labels = [self.delegate labelsForStreamTracker:self];
+        [self trackTagCommanderMediaPlayerEventWithUid:@"pos" withPosition:position labels:labels];
+        
+        // Send a live heartbeat each minute
+        if ([self.delegate streamTrackerIsPlayingLive:self] && self.heartbeatCount % 2 != 0) {
+            [self trackTagCommanderMediaPlayerEventWithUid:@"uptime" withPosition:position labels:labels];
+        }
+    }
+    
+    self.heartbeatCount += 1;
+}
+
+@end
diff --git a/Framework/Sources/Core/SRGAnalyticsTracker+Private.h b/Framework/Sources/Core/SRGAnalyticsTracker+Private.h
new file mode 100644
index 00000000..4da55c7e
--- /dev/null
+++ b/Framework/Sources/Core/SRGAnalyticsTracker+Private.h
@@ -0,0 +1,17 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGAnalyticsTracker.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SRGAnalyticsTracker (Private)
+
+- (void)trackTagCommanderEventWithLabels:(nullable NSDictionary<NSString *, NSString *> *)labels;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Framework/Sources/Core/SRGAnalyticsTracker.h b/Framework/Sources/Core/SRGAnalyticsTracker.h
index 34375b61..f10640fd 100644
--- a/Framework/Sources/Core/SRGAnalyticsTracker.h
+++ b/Framework/Sources/Core/SRGAnalyticsTracker.h
@@ -4,69 +4,62 @@
 //  License information is available from the LICENSE file.
 //
 
+#import "SRGAnalyticsConfiguration.h"
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  @name Supported business units
- */
-typedef NSString * SRGAnalyticsBusinessUnitIdentifier NS_STRING_ENUM;
-
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRSI;
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTR;
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTS;
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSRF;
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSWI;
-
-// This special business unit can be used in test or debug builds of your application if you do not want to pollute
-// actual measurements while in development.
-OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierTEST;
-
-/**
- *  The analytics tracker is a singleton instance responsible of tracking usage of an application, using comScore and
- *  NetMetrix. This usage is simply a collection of key-values (both strings), often referred to as labels, which
- *  can then be used for analytics measurements. 
+ *  The analytics tracker is a singleton instance responsible of tracking usage of an application, sending measurements
+ *  to TagCommander, comScore and NetMetrix. The usage data is simply a collection of key-values (both strings), named
+ *  labels, which can then be used by data analysts in studies and reports.
  *
- *  This tracker implementation follows the SRG SSRG guidelines for application measurements (mostly label name
+ *  The analytics tracker implementation follows the SRG SSRG guidelines for application measurements (mostly label name
  *  conventions) and is therefore only intended for use by applications produced under the SRG SSR umbrella.
  *
  *  ## Measurements
  *
- *  Measurements are based on events emitted by the application, and collected by comScore and NetMetrix. Currently, the
- *  SRGAnalytics library supports the following kinds of events:
+ *  The SRG Analytics library supports three kinds of measurements:
  *    - View events: Appearance of views (page views), which makes it possible to track which content is seen by users.
  *    - Hidden events: Custom events which can be used for measuresement of application functionalities.
- *    - Media playback events (available from the SRGAnalytics_MediaPlayer subframework): Measures audio and video
- *      consumption.
+ *    - Stream playback events: Measurements for audio and video consumption.
  *
- *  All kinds of events can be supplied arbitrary information. This information is primarily meant for use by
- *  comScore. NetMetrix currently only records view events in a fairly basic way. No distinction has been made in
- *  the use of the tracker, though. Events will be transparently sent to the services which support them, with the 
- *  data meaningful for their use.
+ *  For all kinds of measurements, required information must be provided through mandatory parameters, and optional
+ *  labels can be provided through an optional labels object. In all cases, mandatory and optional information is
+ *  transparently routed to the analytics services.
  *
  *  ## Usage
  *
- *  Using SRGAnalytics in your application is intended to be as easy as possible. Since the analytics tracker is
- *  a singleton, you cannot currently perform measurements related to several business units within a single
- *  application, though:
+ *  Using SRGAnalytics in your application is intended to be as easy as possible. Note that since the analytics tracker is
+ *  a singleton, you cannot currently perform measurements related to several business units within a single application.
+ *
+ *  To track application usage:
  *
  *  1. Start the tracker early in your application lifecycle, for example in your application delegate
- *     `-application:didFinishLaunchingWithOptions:` implementation, by calling the
- *     `-startWithBusinessUnitIdentifier:comScoreVirtualSite:netMetrixIdentifier:` method.
+ *     `-application:didFinishLaunchingWithOptions:` implementation, by calling the `-startWithConfiguration:` method. 
+ *     This method expect a single configuration object containing all analytics setup information.
  *  1. To track page views related to view controllers, have them conform to the `SRGAnalyticsViewTracking` protocol.
  *     View controllers conforming to this protocol are automatically tracked by default, but this behavior can be
  *     tailored to your needs, especially if the time at which the measurement is made (when the view appears) is 
  *     inappropriate. Please refer to the `SRGAnalyticsViewTracking` documentation for more information. If your
  *     application uses plain views (not view controllers) which must be tracked as well, you can still perform
- *     tracking via the `-[SRGAnalyticsTracker trackPageViewTitle:levels:customLabels:fromPushNotification:]` method.
+ *     manual tracking via the `-[SRGAnalyticsTracker trackPageViewWithTitle:levels:labels:fromPushNotification:]`
+ *     method.
  *  1. When you need to track specific functionalities in your application (e.g. the use of some interface button
  *     or of some feature of your application), send a hidden event using one of the `-trackHiddenEvent...` methods
  *     available from `SRGAnalyticsTracker`.
- *  1. If you need to track media playback, you must add the SRGAnalytics_MediaPlayer subframework to your project
- *     (@see `SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h` for more information).
- *  1. If you retrieve data using our data provider library, you must add the SRGAnalytics_DataProvider subframework 
- *     to your project (@see `SRGMediaPlayerController+SRGAnalytics_DataProvider.h` for more information).
+ *  1. If you need to track media playback using SRG MediaPlayer, you must add the SRGAnalytics_MediaPlayer subframework
+ *     to your project (@see `SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h` for more information). You are 
+ *     still responsible of providing most metadata associated with playback (e.g. title or duration of what is 
+ *     being played) when calling one of the playback methods provided by this subframework.
+ *  1. If medias you play are retrieved using our SRG DataProvider library, you must add the SRGAnalytics_DataProvider
+ *     subframework to your project as well (@see `SRGMediaPlayerController+SRGAnalytics_DataProvider.h` for more 
+ *     information). In this case, all mandatory stream measurement metadata will be automatically provided when
+ *     playing the content through one of the playback methods provided in this subframework.
+ *
+ *  You can also perform manual stream playback tracking when your player implementation does not rely on SRG MediaPlayer,
+ *  @see `SRGAnalyticsStreamTracker` for more information.
  */
 @interface SRGAnalyticsTracker : NSObject
 
@@ -77,92 +70,145 @@ OBJC_EXPORT SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIde
 
 /**
  *  Start the tracker. This is required to specify for which business unit you are tracking events, as well as to
- *  where they must be sent on the comScore and NetMetrix services. Attempting to track view, hidden or stream events
- *  without starting the tracker has no effect.
- *
- *  During tests, or if you do not want to pollute real measurements during development, you can use the special
- *  `SRGAnalyticsBusinessUnitIdentifierTEST` business unit. This business unit:
- *    - Disables NetMetrix event sending.
- *    - Still sends comScore events to the specified virtual site.
- *    - Adds an `srg_test` label to measurements, specifying the time at which the tracker was started as a timestamp 
- *      (yyyy-MM-dd@HH:mm). This label can be used to identify application sesssions and to gather measurements related
- *      to a session if needed.
+ *  where they must be sent on the comScore, NetMetrix and TagCommander services. Attempting to track view, hidden 
+ *  or stream events without starting the tracker has no effect.
  *
- *  The [JASS proxy](https://github.com/SRGSSR/jass) tool is provided to let you peek at the analytics data sent by your 
- *  application during development or tests.
- 
- *  @param businessUnitIdentifier The SRG SSR business unit for statistics measurements. Constants for the officially
- *                                supported business units are provided at the top of this file. A constant for use
- *                                during development or tests is supplied as well.
- *  @param comScoreVirtualSite    Virtual sites are where comScore measurements are collected. The virtual site you must
- *                                use is usually supplied by the team in charge of measurements for your application.
- *  @param netMetrixIdentifier    The identifier used to group NetMetrix measurements for your application. This value
- *                                is supplied by the team in charge of measurements for your applicatiom.
+ *  @param configuration The configuration to use. This configuration is copied and cannot be changed afterwards.
  */
-- (void)startWithBusinessUnitIdentifier:(NSString *)businessUnitIdentifier
-                    comScoreVirtualSite:(NSString *)comScoreVirtualSite
-                    netMetrixIdentifier:(NSString *)netMetrixIdentifier;
+- (void)startWithConfiguration:(SRGAnalyticsConfiguration *)configuration;
 
 /**
- *  The SRG SSR business unit which measurements are associated with.
+ *  The tracker configuration with which the tracker was started.
  */
-@property (nonatomic, readonly, copy, nullable) NSString *businessUnitIdentifier;
+@property (nonatomic, readonly, copy, nullable) SRGAnalyticsConfiguration *configuration;
+
+@end
 
 /**
- *  The comScore virtual site where statistics are gathered (`nil` if the tracker has not been started).
+ *  @name Hidden event tracking
  */
-@property (nonatomic, readonly, copy, nullable) NSString *comScoreVirtualSite;
 
 /**
- *  The NetMetrix identifier which is used (`nil` if the tracker has not been started).
+ *  Additional hidden event labels.
  */
-@property (nonatomic, readonly, copy, nullable) NSString *netMetrixIdentifier;
+@interface SRGAnalyticsHiddenEventLabels : NSObject
 
 /**
- *  Return `YES` iff the tracker has been started.
+ *  The event type (this concept is loosely defined, please discuss expected values for your application with your
+ *  measurement team).
  */
-@property (nonatomic, readonly, getter=isStarted) BOOL started;
+@property (nonatomic, copy, nullable) NSString *type;
 
 /**
- *  @name Hidden event tracking
+ *  The event value (this concept is loosely defined, please discuss expected values for your application with your
+ *  measurement team).
+ */
+@property (nonatomic, copy, nullable) NSString *value;
+
+/**
+ *  The event source (this concept is loosely defined, please discuss expected values for your application with your
+ *  measurement team).
+ */
+@property (nonatomic, copy, nullable) NSString *source;
+
+/**
+ *  Additional custom information, mapping variables to values. See https://srfmmz.atlassian.net/wiki/spaces/INTFORSCHUNG/pages/197019081
+ *  for a full list of possible variable names.
+ *
+ *  You should rarely need to provide custom information with measurements, as this requires the variable name to be
+ *  declared on TagCommander portal first (otherwise the associated value will be discarded).
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *customInfo;
+
+/**
+ *  Additional custom information to be sent to comScore. See https://srfmmz.atlassian.net/wiki/spaces/SRGPLAY/pages/36077617/Measurement+of+SRG+Player+Apps
+ *  for a full list of possible variable names.
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *comScoreCustomInfo;
+
+@end
+
+@interface SRGAnalyticsTracker (HiddenEventTracking)
+
+/**
+ *  Send a hidden event with the specified name.
+ *
+ *  @param name The event name.
+ *
+ *  @discussion If the name is empty, no event will be sent.
  */
+- (void)trackHiddenEventWithName:(NSString *)name;
 
 /**
- *  Send a hidden event with the specified title.
+ *  Send a hidden event with the specified name.
+ *
+ *  @param name           The event name.
+ *  @param labels         Information to be sent along the event and which is meaningful for your application measurements.
  *
- *  @param title The event title.
+ *  @discussion If the name is `nil`, no event will be sent.
+ */
+- (void)trackHiddenEventWithName:(NSString *)name
+                          labels:(nullable SRGAnalyticsHiddenEventLabels *)labels;
+
+@end
+
+/**
+ *  @name Page view tracking
+ */
+
+/**
+ *  Additional page view labels.
+ */
+@interface SRGAnalyticsPageViewLabels : NSObject
+
+/**
+ *  Additional custom information, mapping variables to values. See https://srfmmz.atlassian.net/wiki/spaces/INTFORSCHUNG/pages/197019081
+ *  for a full list of possible variable names.
  *
- *  @discussion If the title is empty, no event will be sent.
+ *  You should rarely need to provide custom information with measurements, as this requires the variable name to be
+ *  declared on TagCommander portal first (otherwise the associated value will be discarded).
  */
-- (void)trackHiddenEventWithTitle:(NSString *)title;
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *customInfo;
 
 /**
- *  Send a hidden event with the specified title.
+ *  Additional custom information to be sent to comScore. See https://srfmmz.atlassian.net/wiki/spaces/SRGPLAY/pages/36077617/Measurement+of+SRG+Player+Apps
+ *  for a full list of possible variable names.
+ */
+@property (nonatomic, nullable) NSDictionary<NSString *, NSString *> *comScoreCustomInfo;
+
+@end
+
+@interface SRGAnalyticsTracker (PageViewTracking)
+
+/**
+ *  Track a page view (not associated with a push notification).
  *
- *  @param title        The event title.
- *  @param customLabels Custom information to be sent along the event and which is meaningful for your application measurements.
+ *  @param title  The page title. If the title is empty, no event will be sent.
+ *  @param levels An array of levels in increasing order, describing the position of the view in the hierarchy.
  *
- *  @discussion Be careful when using custom labels and ensure your custom keys do not match reserved values by
- *              using appropriate naming conventions (e.g. a prefix). If the title is `nil`, no event will be sent.
+ *  @discussion This method is primarily available for page view tracking not related to a view controller. If your page view
+ *              is related to a view controller, the recommended way of tracking the view controller is by having it conform
+ *              to the `SRGAnalyticsViewTracking` protocol.
  */
-- (void)trackHiddenEventWithTitle:(NSString *)title customLabels:(nullable NSDictionary<NSString *, NSString *> *)customLabels;
+- (void)trackPageViewWithTitle:(NSString *)title
+                        levels:(nullable NSArray<NSString *> *)levels;
 
 /**
  *  Track a page view.
  *
- *  @param title                The page title.
+ *  @param title                The page title. If the title is empty, no event will be sent.
  *  @param levels               An array of levels in increasing order, describing the position of the view in the hierarchy.
- *  @param customLabels         Additional custom labels.
+ *  @param labels               Additional custom labels.
  *  @param fromPushNotification `YES` iff the view is opened from a push notification.
  *
  *  @discussion This method is primarily available for page view tracking not related to a view controller. If your page view
  *              is related to a view controller, the recommended way of tracking the view controller is by having it conform
  *              to the `SRGAnalyticsViewTracking` protocol.
  */
-- (void)trackPageViewTitle:(nullable NSString *)title
-                    levels:(nullable NSArray<NSString *> *)levels
-              customLabels:(nullable NSDictionary<NSString *, NSString *> *)customLabels
-      fromPushNotification:(BOOL)fromPushNotification;
+- (void)trackPageViewWithTitle:(NSString *)title
+                        levels:(nullable NSArray<NSString *> *)levels
+                        labels:(nullable SRGAnalyticsPageViewLabels *)labels
+          fromPushNotification:(BOOL)fromPushNotification;
 
 @end
 
diff --git a/Framework/Sources/Core/SRGAnalyticsTracker.m b/Framework/Sources/Core/SRGAnalyticsTracker.m
index bd303cc7..aae9b8f6 100644
--- a/Framework/Sources/Core/SRGAnalyticsTracker.m
+++ b/Framework/Sources/Core/SRGAnalyticsTracker.m
@@ -6,30 +6,93 @@
 
 #import "SRGAnalyticsTracker.h"
 
-#import "NSDictionary+SRGAnalytics.h"
+#import "NSBundle+SRGAnalytics.h"
+#import "NSMutableDictionary+SRGAnalytics.h"
 #import "NSString+SRGAnalytics.h"
+#import "SRGAnalytics.h"
 #import "SRGAnalyticsLogger.h"
 #import "SRGAnalyticsNetMetrixTracker.h"
 #import "SRGAnalyticsNotifications.h"
 #import "UIViewController+SRGAnalytics.h"
 
+#import <ComScore/ComScore.h>
 #import <ComScore/CSTaskExecutor.h>
+#import <TCSDK/TCSDK.h>
 
 SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRSI = @"rsi";
 SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTR = @"rtr";
 SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierRTS = @"rts";
 SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSRF = @"srf";
+SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSRG = @"srg";
 SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierSWI = @"swi";
-SRGAnalyticsBusinessUnitIdentifier const SRGAnalyticsBusinessUnitIdentifierTEST = @"test";
 
 @interface SRGAnalyticsTracker ()
 
-@property (nonatomic, copy) NSString *businessUnitIdentifier;
-@property (nonatomic, copy) NSString *comScoreVirtualSite;
-@property (nonatomic, copy) NSString *netMetrixIdentifier;
-@property (nonatomic, getter=isStarted) BOOL started;
+@property (nonatomic, copy) SRGAnalyticsConfiguration *configuration;
 
+@property (nonatomic) TagCommander *tagCommander;
 @property (nonatomic) SRGAnalyticsNetMetrixTracker *netmetrixTracker;
+@property (nonatomic) CSStreamSense *streamSense;
+
+@end
+
+@implementation SRGAnalyticsHiddenEventLabels
+
+- (NSDictionary<NSString *, NSString *> *)labelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary srg_safelySetString:self.type forKey:@"event_type"];
+    [dictionary srg_safelySetString:self.value forKey:@"event_value"];
+    [dictionary srg_safelySetString:self.source forKey:@"event_source"];
+    
+    if (self.customInfo) {
+        [dictionary addEntriesFromDictionary:self.customInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+- (NSDictionary<NSString *, NSString *> *)comScoreLabelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary srg_safelySetString:self.type forKey:@"srg_evgroup"];
+    [dictionary srg_safelySetString:self.value forKey:@"srg_evvalue"];
+    [dictionary srg_safelySetString:self.source forKey:@"srg_evsource"];
+    
+    if (self.comScoreCustomInfo) {
+        [dictionary addEntriesFromDictionary:self.comScoreCustomInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+@end
+
+@implementation SRGAnalyticsPageViewLabels
+
+- (NSDictionary<NSString *, NSString *> *)labelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    if (self.customInfo) {
+        [dictionary addEntriesFromDictionary:self.customInfo];
+    }
+    
+    return [dictionary copy];
+}
+
+- (NSDictionary<NSString *, NSString *> *)comScoreLabelsDictionary
+{
+    NSMutableDictionary<NSString *, NSString *> *dictionary = [NSMutableDictionary dictionary];
+    
+    if (self.comScoreCustomInfo) {
+        [dictionary addEntriesFromDictionary:self.comScoreCustomInfo];
+    }
+    
+    return [dictionary copy];
+}
 
 @end
 
@@ -47,55 +110,57 @@ + (instancetype)sharedTracker
     return s_sharedInstance;
 }
 
-#pragma mark Object lifecycle
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 #pragma mark Start
 
-- (void)startWithBusinessUnitIdentifier:(NSString *)businessUnitIdentifier
-                    comScoreVirtualSite:(NSString *)comScoreVirtualSite
-                    netMetrixIdentifier:(NSString *)netMetrixIdentifier
-{    
-    self.businessUnitIdentifier = businessUnitIdentifier;
-    self.comScoreVirtualSite = comScoreVirtualSite;
-    self.netMetrixIdentifier = netMetrixIdentifier;
+- (void)startWithConfiguration:(SRGAnalyticsConfiguration *)configuration
+{
+    self.configuration = configuration;
     
-    self.started = YES;
+    [self startTagCommanderTrackerWithConfiguration:configuration];
+    [self startComscoreTrackerWithConfiguration:configuration];
+    [self startNetmetrixTrackerWithConfiguration:configuration];
     
-    [self startComscoreTracker];
-    [self startNetmetrixTracker];
+    [self sendApplicationList];
+}
+
+- (void)startTagCommanderTrackerWithConfiguration:(SRGAnalyticsConfiguration *)configuration
+{
+    if (! configuration.unitTesting) {
+        self.tagCommander = [[TagCommander alloc] initWithSiteID:(int)configuration.site andContainerID:(int)configuration.container];
+        [self.tagCommander addPermanentData:@"app_library_version" withValue:SRGAnalyticsMarketingVersion()];
+        [self.tagCommander addPermanentData:@"navigation_app_site_name" withValue:configuration.comScoreVirtualSite];
+        [self.tagCommander addPermanentData:@"navigation_environment" withValue:[NSBundle srg_isProductionVersion] ? @"prod" : @"preprod"];
+    }
 }
 
-- (void)startComscoreTracker
+- (void)startComscoreTrackerWithConfiguration:(SRGAnalyticsConfiguration *)configuration
 {
     [CSComScore setAppContext];
     [CSComScore setSecure:YES];
     [CSComScore setCustomerC2:@"6036016"];
     [CSComScore setPublisherSecret:@"b19346c7cb5e521845fb032be24b0154"];
     [CSComScore enableAutoUpdate:60 foregroundOnly:NO];     //60 is the Comscore default interval value
-    NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-    if (appName) {
-        [CSComScore setAutoStartLabels:@{ @"name": appName }];
+    
+    NSString *applicationName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+    if (applicationName) {
+        [CSComScore setAutoStartLabels:@{ @"name": applicationName }];
     }
-    [CSComScore setLabels:[self comscoreGlobalLabels]];
     
-    [self startLoggingInternalComScoreTasks];
-    [self sendApplicationList];
+    [CSComScore setLabels:[self comscoreGlobalLabelsWithConfiguration:configuration]];
+    
+    // The default keep-alive time interval of 20 minutes is too big. Set it to 9 minutes
+    self.streamSense = [[CSStreamSense alloc] init];
+    [self.streamSense setKeepAliveInterval:9 * 60];
 }
 
-- (void)startNetmetrixTracker
+- (void)startNetmetrixTrackerWithConfiguration:(SRGAnalyticsConfiguration *)configuration
 {
-    self.netmetrixTracker = [[SRGAnalyticsNetMetrixTracker alloc] initWithIdentifier:self.netMetrixIdentifier
-                                                              businessUnitIdentifier:self.businessUnitIdentifier];
+    self.netmetrixTracker = [[SRGAnalyticsNetMetrixTracker alloc] initWithConfiguration:configuration];
 }
 
 #pragma mark Labels
 
-- (NSDictionary<NSString *, NSString *> *)comscoreGlobalLabels
+- (NSDictionary<NSString *, NSString *> *)comscoreGlobalLabelsWithConfiguration:(SRGAnalyticsConfiguration *)configuration
 {
     NSBundle *mainBundle = [NSBundle mainBundle];
     
@@ -103,15 +168,16 @@ - (void)startNetmetrixTracker
     NSString *appLanguage = mainBundle.preferredLocalizations.firstObject ?: @"fr";
     NSString *appVersion = [mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     
-    NSMutableDictionary<NSString *, NSString *> *globalLabels = [@{ @"ns_ap_an": appName,
-                                                                    @"ns_ap_lang": [NSLocale canonicalLanguageIdentifierFromString:appLanguage],
-                                                                    @"ns_ap_ver": appVersion,
-                                                                    @"srg_unit": self.businessUnitIdentifier.uppercaseString,
-                                                                    @"srg_ap_push": @"0",
-                                                                    @"ns_site": @"mainsite",                                    // The 'mainsite' is a constant value. If wrong, everything is screwed.
-                                                                    @"ns_vsite": self.comScoreVirtualSite } mutableCopy];       // The virtual site 'vsite' is associated with the app. It is created by comScore
+    NSMutableDictionary<NSString *, NSString *> *globalLabels = [@{ @"ns_ap_an" : appName,
+                                                                    @"ns_ap_lang" : [NSLocale canonicalLanguageIdentifierFromString:appLanguage],
+                                                                    @"ns_ap_ver" : appVersion,
+                                                                    @"srg_unit" : configuration.businessUnitIdentifier.uppercaseString,
+                                                                    @"srg_ap_push" : @"0",
+                                                                    @"ns_site" : @"mainsite",                                          // The 'mainsite' is a constant value. If wrong, everything is screwed.
+                                                                    @"ns_vsite" : configuration.comScoreVirtualSite,                   // The virtual site 'vsite' is associated with the app. It is created by comScore
+                                                                    @"ns_st_pu" : SRGAnalyticsMarketingVersion() } mutableCopy];
     
-    if ([self.businessUnitIdentifier isEqualToString:SRGAnalyticsBusinessUnitIdentifierTEST]) {
+    if (configuration.unitTesting) {
         static NSString *s_debugTimestamp;
         static dispatch_once_t s_onceToken;
         dispatch_once(&s_onceToken, ^{
@@ -124,32 +190,104 @@ - (void)startNetmetrixTracker
     return [globalLabels copy];
 }
 
-#pragma mark Page view tracking (private)
+- (NSString *)pageIdWithTitle:(NSString *)title levels:(NSArray<NSString *> *)levels
+{
+    NSString *category = @"app";
+    
+    if (levels.count > 0) {
+        __block NSMutableString *levelsComScoreFormattedString = [NSMutableString new];
+        [levels enumerateObjectsUsingBlock:^(NSString * _Nonnull level, NSUInteger idx, BOOL * _Nonnull stop) {
+            if (levelsComScoreFormattedString.length > 0) {
+                [levelsComScoreFormattedString appendString:@"."];
+            }
+            [levelsComScoreFormattedString appendString:level.srg_comScoreFormattedString];
+        }];
+        category = [levelsComScoreFormattedString copy];
+    }
+    
+    return [NSString stringWithFormat:@"%@.%@", category, title.srg_comScoreFormattedString];
+}
+
+#pragma mark General event tracking (internal use only)
 
-- (void)trackPageViewTitle:(NSString *)title levels:(NSArray<NSString *> *)levels customLabels:(NSDictionary<NSString *, NSString *> *)customLabels fromPushNotification:(BOOL)fromPushNotification;
+- (void)trackEventWithLabels:(NSDictionary<NSString *, NSString *> *)labels
+              comScoreLabels:(NSDictionary<NSString *, NSString *> *)comScoreLabels
+{
+    [self trackTagCommanderEventWithLabels:labels];
+    [self trackComScoreEventWithLabels:comScoreLabels];
+}
+
+- (void)trackComScoreEventWithLabels:(NSDictionary<NSString *, NSString *> *)labels
+{
+    [CSComScore hiddenWithLabels:labels];
+}
+
+- (void)trackTagCommanderEventWithLabels:(NSDictionary<NSString *, NSString *> *)labels
+{
+    // TagCommander might not initialized (for the test business unit)
+    if (self.tagCommander) {
+        [labels enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull object, BOOL * _Nonnull stop) {
+            [self.tagCommander addData:key withValue:object];
+        }];
+        [self.tagCommander sendData];
+    }
+    else {
+        // Only custom labels are sent in the notification userInfo. Internal predefined TagCommander variables are not sent,
+        // as they are not needed for tests (they are part of what is guaranteed by the TagCommander SDK). For a complete list of
+        // predefined variables, see https://github.com/TagCommander/pods/blob/master/TCSDK/PredefinedVariables.md
+        [[NSNotificationCenter defaultCenter] postNotificationName:SRGAnalyticsRequestNotification
+                                                            object:self
+                                                          userInfo:@{ SRGAnalyticsLabelsKey : labels }];
+    }
+}
+
+#pragma mark Page view tracking
+
+- (void)trackPageViewWithTitle:(NSString *)title levels:(NSArray<NSString *> *)levels
+{
+    [self trackPageViewWithTitle:title levels:levels labels:nil fromPushNotification:NO];
+}
+
+- (void)trackPageViewWithTitle:(NSString *)title
+                        levels:(NSArray<NSString *> *)levels
+                        labels:(SRGAnalyticsPageViewLabels *)labels
+          fromPushNotification:(BOOL)fromPushNotification
 {
     if (title.length == 0) {
         SRGAnalyticsLogWarning(@"tracker", @"Missing title. No event will be sent");
         return;
     }
     
-    NSMutableDictionary *labels = [NSMutableDictionary dictionary];
-    [labels safeSetValue:title forKey:@"srg_title"];
-    [labels safeSetValue:@(fromPushNotification) forKey:@"srg_ap_push"];
+    [self trackTagCommanderPageViewWithTitle:title levels:levels labels:labels fromPushNotification:fromPushNotification];
+    [self trackComScorePageViewWithTitle:title levels:levels labels:labels fromPushNotification:fromPushNotification];
+    
+    [self.netmetrixTracker trackView];
+}
+
+- (void)trackComScorePageViewWithTitle:(NSString *)title
+                                levels:(NSArray<NSString *> *)levels
+                                labels:(SRGAnalyticsPageViewLabels *)labels
+                  fromPushNotification:(BOOL)fromPushNotification
+{
+    NSAssert(title.length != 0, @"A title is required");
+    
+    NSMutableDictionary *pageViewLabelsDictionary = [NSMutableDictionary dictionary];
+    [pageViewLabelsDictionary srg_safelySetString:title forKey:@"srg_title"];
+    [pageViewLabelsDictionary srg_safelySetString:@(fromPushNotification).stringValue forKey:@"srg_ap_push"];
     
     NSString *category = @"app";
     
     if (! levels) {
-        [labels safeSetValue:category forKey:@"srg_n1"];
+        [pageViewLabelsDictionary srg_safelySetString:category forKey:@"srg_n1"];
     }
     else if (levels.count > 0) {
         __block NSMutableString *levelsComScoreFormattedString = [NSMutableString new];
-        [levels enumerateObjectsUsingBlock:^(id value, NSUInteger idx, BOOL *stop) {
+        [levels enumerateObjectsUsingBlock:^(NSString * _Nonnull object, NSUInteger idx, BOOL * _Nonnull stop) {
             NSString *levelKey = [NSString stringWithFormat:@"srg_n%@", @(idx + 1)];
-            NSString *levelValue = [value description];
+            NSString *levelValue = [object description];
             
             if (idx < 10) {
-                [labels safeSetValue:levelValue forKey:levelKey];
+                [pageViewLabelsDictionary srg_safelySetString:levelValue forKey:levelKey];
             }
             
             if (levelsComScoreFormattedString.length > 0) {
@@ -161,43 +299,101 @@ - (void)trackPageViewTitle:(NSString *)title levels:(NSArray<NSString *> *)level
         category = [levelsComScoreFormattedString copy];
     }
     
-    [labels safeSetValue:category forKey:@"category"];
-    [labels safeSetValue:[NSString stringWithFormat:@"%@.%@", category, title.srg_comScoreFormattedString] forKey:@"name"];
+    [pageViewLabelsDictionary srg_safelySetString:category forKey:@"category"];
+    [pageViewLabelsDictionary srg_safelySetString:[self pageIdWithTitle:title levels:levels] forKey:@"name"];
     
-    [customLabels enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
-        [labels safeSetValue:[obj description] forKey:[key description]];
+    NSDictionary<NSString *, NSString *> *comScoreLabelsDictionary = [labels comScoreLabelsDictionary];
+    if (comScoreLabelsDictionary) {
+        [pageViewLabelsDictionary addEntriesFromDictionary:comScoreLabelsDictionary];
+    }
+    
+    [CSComScore viewWithLabels:pageViewLabelsDictionary];
+}
+
+- (void)trackTagCommanderPageViewWithTitle:(NSString *)title
+                                    levels:(NSArray<NSString *> *)levels
+                                    labels:(SRGAnalyticsPageViewLabels *)labels
+                      fromPushNotification:(BOOL)fromPushNotification
+{
+    NSAssert(title.length != 0, @"A title is required");
+    
+    NSMutableDictionary<NSString *, NSString *> *fullLabelsDictionary = [NSMutableDictionary dictionary];
+    [fullLabelsDictionary srg_safelySetString:@"screen" forKey:@"event_id"];
+    [fullLabelsDictionary srg_safelySetString:@"app" forKey:@"navigation_property_type"];
+    [fullLabelsDictionary srg_safelySetString:title forKey:@"content_title"];
+    [fullLabelsDictionary srg_safelySetString:self.configuration.businessUnitIdentifier.uppercaseString forKey:@"navigation_bu_distributer"];
+    [fullLabelsDictionary srg_safelySetString:fromPushNotification ? @"true" : @"false" forKey:@"accessed_after_push_notification"];
+    [fullLabelsDictionary srg_safelySetString:[self pageIdWithTitle:title levels:levels] forKey:@"page_id"];
+
+    
+    [levels enumerateObjectsUsingBlock:^(NSString * _Nonnull object, NSUInteger idx, BOOL * _Nonnull stop) {
+        if (idx > 7) {
+            *stop = YES;
+            return;
+        }
+        
+        NSString *levelKey = [NSString stringWithFormat:@"navigation_level_%@", @(idx + 1)];
+        [fullLabelsDictionary srg_safelySetString:object forKey:levelKey];
     }];
     
-    [CSComScore viewWithLabels:labels];
+    NSDictionary<NSString *, NSString *> *labelsDictionary = [labels labelsDictionary];
+    if (labelsDictionary) {
+        [fullLabelsDictionary addEntriesFromDictionary:labelsDictionary];
+    }
     
-    [self.netmetrixTracker trackView];
+    [self trackTagCommanderEventWithLabels:[fullLabelsDictionary copy]];
 }
 
 #pragma mark Hidden event tracking
 
-- (void)trackHiddenEventWithTitle:(NSString *)title
+- (void)trackHiddenEventWithName:(NSString *)name
 {
-    [self trackHiddenEventWithTitle:title customLabels:nil];
+    [self trackHiddenEventWithName:name labels:nil];
 }
 
-- (void)trackHiddenEventWithTitle:(NSString *)title customLabels:(NSDictionary *)customLabels
+- (void)trackHiddenEventWithName:(NSString *)name
+                          labels:(SRGAnalyticsHiddenEventLabels *)labels
 {
-    if (title.length == 0) {
-        SRGAnalyticsLogWarning(@"tracker", @"Missing title. No event will be sent");
+    if (name.length == 0) {
+        SRGAnalyticsLogWarning(@"tracker", @"Missing name. No event will be sent");
         return;
     }
     
-    NSMutableDictionary *labels = [NSMutableDictionary dictionary];
-    [labels safeSetValue:title forKey:@"srg_title"];
+    [self trackTagCommanderHiddenEventWithName:name labels:labels];
+    [self trackComScoreHiddenEventWithName:name labels:labels];
+}
+
+- (void)trackComScoreHiddenEventWithName:(NSString *)name labels:(SRGAnalyticsHiddenEventLabels *)labels
+{
+    NSAssert(name.length != 0, @"A name is required");
     
-    [labels safeSetValue:@"app" forKey:@"category"];
-    [labels safeSetValue:[NSString stringWithFormat:@"app.%@", title.srg_comScoreFormattedString] forKey:@"name"];
+    NSMutableDictionary *hiddenEventLabelsDictionary = [NSMutableDictionary dictionary];
+    [hiddenEventLabelsDictionary srg_safelySetString:name forKey:@"srg_title"];
+    [hiddenEventLabelsDictionary srg_safelySetString:@"app" forKey:@"category"];
+    [hiddenEventLabelsDictionary srg_safelySetString:[NSString stringWithFormat:@"app.%@", name.srg_comScoreFormattedString] forKey:@"name"];
     
-    [customLabels enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
-        [labels safeSetValue:[obj description] forKey:[key description]];
-    }];
+    NSDictionary<NSString *, NSString *> *comScoreLabelsDictionary = [labels comScoreLabelsDictionary];
+    if (comScoreLabelsDictionary) {
+        [hiddenEventLabelsDictionary addEntriesFromDictionary:comScoreLabelsDictionary];
+    }
     
-    [CSComScore hiddenWithLabels:labels];
+    [CSComScore hiddenWithLabels:hiddenEventLabelsDictionary];
+}
+
+- (void)trackTagCommanderHiddenEventWithName:(NSString *)name labels:(SRGAnalyticsHiddenEventLabels *)labels
+{
+    NSAssert(name.length != 0, @"A name is required");
+    
+    NSMutableDictionary<NSString *, NSString *> *fullLabelsDictionary = [NSMutableDictionary dictionary];
+    [fullLabelsDictionary srg_safelySetString:@"hidden_event" forKey:@"event_id"];
+    [fullLabelsDictionary srg_safelySetString:name forKey:@"event_name"];
+    
+    NSDictionary<NSString *, NSString *> *labelsDictionary = [labels labelsDictionary];
+    if (labelsDictionary) {
+        [fullLabelsDictionary addEntriesFromDictionary:labelsDictionary];
+    }
+    
+    [self trackTagCommanderEventWithLabels:[fullLabelsDictionary copy]];
 }
 
 #pragma mark Application list measurement
@@ -263,94 +459,29 @@ - (void)sendApplicationList
                                      "update your Info.plist file to make this message disappear");
             }
             
-            if (installedApplications.count == 0) {
-                SRGAnalyticsLogWarning(@"tracker", @"No identified application installed. Nothing to be done");
-                return;
-            }
+            NSArray<NSString *> *sortedInstalledApplications = [installedApplications.allObjects sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
             
-            NSArray *sortedInstalledApplications = [installedApplications.allObjects sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
-            NSDictionary *labels = @{ @"srg_evgroup" : @"Installed Apps",
-                                      @"srg_evname" : [sortedInstalledApplications componentsJoinedByString:@","] };
-            [CSComScore hiddenWithLabels:labels];
+            SRGAnalyticsHiddenEventLabels *labels = [[SRGAnalyticsHiddenEventLabels alloc] init];
+            labels.type = @"hidden";
+            labels.source = @"SRGAnalytics";
+            labels.value = [sortedInstalledApplications componentsJoinedByString:@";"];
+            labels.comScoreCustomInfo = @{ @"srg_evgroup": @"Installed Apps",
+                                           @"srg_evname": [sortedInstalledApplications componentsJoinedByString:@","] };
+            
+            [self trackHiddenEventWithName:@"Installed Apps" labels:labels];
         });
     }] resume];
 }
 
-#pragma mark Logging
-
-- (void)startLoggingInternalComScoreTasks
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(comScoreRequestDidFinish:)
-                                                 name:SRGAnalyticsComScoreRequestNotification
-                                               object:nil];
-    
-    // +[CSComScore setPixelURL:] is dispatched on an internal comScore queue, so calling +[CSComScore pixelURL]
-    // right after doesn’t work, we must also dispatch it on the same queue!
-    [[[CSComScore core] taskExecutor] execute:^{
-        const SEL selectors[] = {
-            @selector(appName),
-            @selector(pixelURL),
-            @selector(publisherSecret),
-            @selector(customerC2),
-            @selector(version),
-            @selector(labels)
-        };
-        
-        NSMutableString *message = [NSMutableString new];
-        for (NSUInteger i = 0; i < sizeof(selectors) / sizeof(selectors[0]); i++) {
-            SEL selector = selectors[i];
-            [message appendFormat:@"%@: %@\n", NSStringFromSelector(selector), [CSComScore performSelector:selector]];
-        }
-        [message deleteCharactersInRange:NSMakeRange(message.length - 1, 1)];
-        SRGAnalyticsLogDebug(@"tracker", @"%@", message);
-    } background:YES];
-}
-
-#pragma mark Notifications
-
-- (void)comScoreRequestDidFinish:(NSNotification *)notification
-{
-    NSDictionary *labels = notification.userInfo[SRGAnalyticsComScoreLabelsKey];
-    NSUInteger maxKeyLength = [[[labels allKeys] valueForKeyPath:@"@max.length"] unsignedIntegerValue];
-    
-    NSMutableString *dictionaryRepresentation = [NSMutableString new];
-    for (NSString *key in [[labels allKeys] sortedArrayUsingSelector:@selector(compare:)]) {
-        [dictionaryRepresentation appendFormat:@"%@ = %@\n", [key stringByPaddingToLength:maxKeyLength withString:@" " startingAtIndex:0], labels[key]];
-    }
-    
-    NSString *ns_st_ev = labels[@"ns_st_ev"];
-    NSString *ns_ap_ev = labels[@"ns_ap_ev"];
-    NSString *type = labels[@"ns_st_ty"];
-    NSString *typeSymbol = @"\U00002753"; // BLACK QUESTION MARK ORNAMENT
-    
-    if ([type.lowercaseString isEqual:@"audio"]) {
-        typeSymbol = @"\U0001F4FB"; // RADIO
-    }
-    else if ([type.lowercaseString isEqual:@"video"]) {
-        typeSymbol = @"\U0001F4FA"; // TELEVISION
-    }
-    
-    if ([labels[@"ns_st_li"] boolValue]) {
-        typeSymbol = [typeSymbol stringByAppendingString:@"\U0001F6A8"];
-    }
-    
-    NSString *event = ns_st_ev ? [typeSymbol stringByAppendingFormat:@" %@", ns_st_ev] : ns_ap_ev;
-    NSString *name = ns_st_ev ? [NSString stringWithFormat:@"%@ / %@", labels[@"ns_st_pl"], labels[@"ns_st_ep"]] : labels[@"name"];
-    SRGAnalyticsLogDebug(@"tracker", @"Event %@ with name %@ and labels %@", event, name, labels);
-}
-
 #pragma mark Description
 
 - (NSString *)description
 {
-    if (self.started) {
-        return [NSString stringWithFormat:@"<%@: %p; businessUnitIdentifier: %@; comScoreVirtualSite: %@; netMetrixIdentifier: %@>",
+    if (self.configuration) {
+        return [NSString stringWithFormat:@"<%@: %p; configuration: %@>",
                 [self class],
                 self,
-                self.businessUnitIdentifier,
-                self.comScoreVirtualSite,
-                self.netMetrixIdentifier];
+                self.configuration];
     }
     else {
         return [NSString stringWithFormat:@"<%@: %p (not started yet)>", [self class], self];
diff --git a/Framework/Sources/Core/UIViewController+SRGAnalytics.h b/Framework/Sources/Core/UIViewController+SRGAnalytics.h
index e4eccb1a..81de203c 100644
--- a/Framework/Sources/Core/UIViewController+SRGAnalytics.h
+++ b/Framework/Sources/Core/UIViewController+SRGAnalytics.h
@@ -4,27 +4,29 @@
 //  License information is available from the LICENSE file.
 //
 
+#import "SRGAnalyticsTracker.h"
+
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  View controllers whose use must be tracked by comScore and NetMetrix view events must conform to the
- *  `SRGAnalyticsViewTracking` protocol, which describes the data to send with such events. The only method
- *  required by this protocol is `srg_pageViewTitle`, which provides the name to be used for the view events.
- *
- *  Optional methods can be implemented to provide more information and custom measurement information (labels).
+ *  View controllers whose usage must be tracked should conform to the `SRGAnalyticsViewTracking` protocol, which
+ *  describes the data to send with such events. The only method required by this protocol is `srg_pageViewTitle`, 
+ *  which provides the name to be used for the view events.
  *
  *  By default, if a view controller conforms to the `SRGAnalyticsViewTracking` protocol, a view event will
- *  automatically be sent when its `-viewDidAppear:` method is called (only when the view controller is added
- *  to the view controller hierarchy), or when the application returns from background while the view controller
- *  is visible.
+ *  automatically be sent when it is presented (when `-viewWillAppear:` is called), or when the application 
+ *  returns from background while the view controller is visible.
  *
- *  If you want to control when such events are sent, however, you can implement the optional `trackedAutomatically`
- *  property to return `NO`, disabling the mechanisms described above. In such cases, you are responsible of calling the
+ *  If you want to control when page view events are sent, however, you can implement the optional `srg_isTrackedAutomatically`
+ *  method to return `NO`, disabling the mechanism described above. In this case you are responsible of calling the
  *  `-[UIViewController trackPageView]` method appropriately when you want the measurement event to be recorded. This 
  *  approach is useful when the labels are not available at the time `-viewDidAppear:` is called, e.g. if they are 
  *  retrieved from a web service request started when the view controller gets displayed.
+ *
+ *  If you prefer, you can also perform page view tracking using the corresponding methods available from
+ *  `SRGAnalyticsTracker`.
  */
 @protocol SRGAnalyticsViewTracking <NSObject>
 
@@ -49,21 +51,14 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Return the levels (position in the view hierarchy) to be sent for view event measurement.
  *
- *  If the page view levels array is `nil` or empty, an 'app' default level will be used.
- *
  *  @return The array of levels, in increasing depth order.
  */
 @property (nonatomic, readonly, nullable) NSArray<NSString *> *srg_pageViewLevels;
 
 /**
  *  Additional information (labels) which must be sent with a view event. By default no custom labels are sent.
- *
- *  @return The dictionary of labels.
- *
- *  @discussion Be careful when using custom labels and ensure your custom keys do not match reserved values by
- *              using appropriate naming conventions (e.g. a prefix).
  */
-@property (nonatomic, readonly, nullable) NSDictionary<NSString *, NSString *> *srg_pageViewCustomLabels;
+@property (nonatomic, readonly, nullable) SRGAnalyticsPageViewLabels *srg_pageViewLabels;
 
 /**
  *  Return `YES` if the the view controller was opened from a push notification. If not implemented, it is assumed the
diff --git a/Framework/Sources/Core/UIViewController+SRGAnalytics.m b/Framework/Sources/Core/UIViewController+SRGAnalytics.m
index 4a2238ed..2c36489e 100644
--- a/Framework/Sources/Core/UIViewController+SRGAnalytics.m
+++ b/Framework/Sources/Core/UIViewController+SRGAnalytics.m
@@ -15,8 +15,8 @@
 static void (*s_viewWillDisappear)(id, SEL, BOOL);
 
 // Swizzled method implementations
-static void swizzed_viewDidAppear(UIViewController *self, SEL _cmd, BOOL animated);
-static void swizzed_viewWillDisappear(UIViewController *self, SEL _cmd, BOOL animated);
+static void swizzled_viewDidAppear(UIViewController *self, SEL _cmd, BOOL animated);
+static void swizzled_viewWillDisappear(UIViewController *self, SEL _cmd, BOOL animated);
 
 @implementation UIViewController (SRGAnalytics)
 
@@ -26,11 +26,11 @@ + (void)load
 {
     Method viewDidAppearMethod = class_getInstanceMethod(self, @selector(viewDidAppear:));
     s_viewDidAppear = (__typeof__(s_viewDidAppear))method_getImplementation(viewDidAppearMethod);
-    method_setImplementation(viewDidAppearMethod, (IMP)swizzed_viewDidAppear);
+    method_setImplementation(viewDidAppearMethod, (IMP)swizzled_viewDidAppear);
     
     Method viewWillDisappearMethod = class_getInstanceMethod(self, @selector(viewWillDisappear:));
     s_viewWillDisappear = (__typeof__(s_viewWillDisappear))method_getImplementation(viewWillDisappearMethod);
-    method_setImplementation(viewWillDisappearMethod, (IMP)swizzed_viewWillDisappear);
+    method_setImplementation(viewWillDisappearMethod, (IMP)swizzled_viewWillDisappear);
 }
 
 #pragma mark Tracking
@@ -45,7 +45,7 @@ - (void)srg_trackPageViewForced:(BOOL)forced
     if ([self conformsToProtocol:@protocol(SRGAnalyticsViewTracking)]) {
         id<SRGAnalyticsViewTracking> trackedSelf = (id<SRGAnalyticsViewTracking>)self;
         
-        if (!forced && [trackedSelf respondsToSelector:@selector(srg_isTrackedAutomatically)] && ! [trackedSelf srg_isTrackedAutomatically]) {
+        if (! forced && [trackedSelf respondsToSelector:@selector(srg_isTrackedAutomatically)] && ! [trackedSelf srg_isTrackedAutomatically]) {
             return;
         }
         
@@ -56,9 +56,9 @@ - (void)srg_trackPageViewForced:(BOOL)forced
             levels = [trackedSelf srg_pageViewLevels];
         }
         
-        NSDictionary<NSString *, NSString *> *customLabels = nil;
-        if ([trackedSelf respondsToSelector:@selector(srg_pageViewCustomLabels)]) {
-            customLabels = [trackedSelf srg_pageViewCustomLabels];
+        SRGAnalyticsPageViewLabels *labels = nil;
+        if ([trackedSelf respondsToSelector:@selector(srg_pageViewLabels)]) {
+            labels = [trackedSelf srg_pageViewLabels];
         }
         
         BOOL fromPushNotification = NO;
@@ -66,10 +66,10 @@ - (void)srg_trackPageViewForced:(BOOL)forced
             fromPushNotification = [trackedSelf srg_isOpenedFromPushNotification];
         }
         
-        [[SRGAnalyticsTracker sharedTracker] trackPageViewTitle:title
-                                                         levels:levels
-                                                   customLabels:customLabels
-                                           fromPushNotification:fromPushNotification];
+        [[SRGAnalyticsTracker sharedTracker] trackPageViewWithTitle:title
+                                                             levels:levels
+                                                             labels:labels
+                                               fromPushNotification:fromPushNotification];
     }
 }
 
@@ -84,7 +84,7 @@ - (void)srg_viewController_analytics_applicationWillEnterForeground:(NSNotificat
 
 #pragma mark Functions
 
-static void swizzed_viewDidAppear(UIViewController *self, SEL _cmd, BOOL animated)
+static void swizzled_viewDidAppear(UIViewController *self, SEL _cmd, BOOL animated)
 {
     s_viewDidAppear(self, _cmd, animated);
     
@@ -98,7 +98,7 @@ static void swizzed_viewDidAppear(UIViewController *self, SEL _cmd, BOOL animate
                                                object:nil];
 }
 
-static void swizzed_viewWillDisappear(UIViewController *self, SEL _cmd, BOOL animated)
+static void swizzled_viewWillDisappear(UIViewController *self, SEL _cmd, BOOL animated)
 {
     s_viewWillDisappear(self, _cmd, animated);
     
diff --git a/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.h b/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.h
index 42c34373..d06dc32f 100644
--- a/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.h
+++ b/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.h
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Internal category on a comScore class, used for swizzling purposes.
  */
-@interface CSMeasurementDispatcher (SRGNotification)
+@interface CSMeasurementDispatcher (SRGAnalytics)
 
 @end
 
diff --git a/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.m b/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.m
index 6cda356d..1503cbb8 100644
--- a/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.m
+++ b/Framework/Sources/Helpers/CSMeasurementDispatcher+SRGAnalytics.m
@@ -12,6 +12,8 @@
 
 #import <objc/runtime.h>
 
+static CSCore *s_fakeCore;
+
 // Private comScore methods
 @interface NSObject (SRGCSApplicationMeasurement)
 
@@ -20,7 +22,13 @@ - (NSDictionary *)getLabels;
 
 @end
 
-@implementation CSMeasurementDispatcher (SRGNotification)
+__attribute__((constructor)) static void CSMeasurementDispatcherInit(void)
+{
+    // Create early enough since initialized asynchronously in comScore SDK (!)
+    s_fakeCore = [[CSCore alloc] init];
+}
+
+@implementation CSMeasurementDispatcher (SRGAnalytics)
 
 #pragma mark Class methods
 
@@ -34,56 +42,37 @@ + (void)load
 
 - (void)swizzled_send:(CSApplicationEventType)eventType labels:(NSDictionary *)labels cache:(BOOL)cache background:(BOOL)background
 {
-    // Call the original implementation
-    [self swizzled_send:eventType labels:labels cache:cache background:background];
-
-    // Do not do anything when not running in test mode
-    SRGAnalyticsTracker *tracker = [SRGAnalyticsTracker sharedTracker];
-    if (! [tracker.businessUnitIdentifier isEqualToString:SRGAnalyticsBusinessUnitIdentifierTEST]) {
-        return;
-    }
-    
-    id core = object_getIvar(self, class_getInstanceVariable([self class], "_core"));
-    
-    // The application measurement creation below will crash if the AdSupport framework is linked with the project. We can
-    // apply a fix by forcing unique id generation, but this fix was discovered to lead to subtle internal comScore issues.
-    // We still keep this fix for the test BU, used in our test suite. Everything will be dropped when comScore is replaced,
-    // after all
-    if (NSClassFromString(@"ASIdentifierManager") != Nil) {
-        SRGAnalyticsLogWarning(@"notifications", @"comScore notifications are not sent when the AdSupport framework is linked "
-                               "to the project. Contact us if this support is really required in your case.");
+    SRGAnalyticsConfiguration *configuration = [SRGAnalyticsTracker sharedTracker].configuration;
+    if (configuration.unitTesting) {
+        // Labels are not complete. To get (almost) all labels we mimic the comScore SDK by creating the measurement object. The
+        // timestamp will not be identical to the timestamp of the real event which is sent afterwards, and global labels will
+        // be missing.
+        long long timestamp = [[NSDate date] timeIntervalSince1970];
+        id measurement = [NSClassFromString(@"CSApplicationMeasurement") newWithCore:s_fakeCore eventType:eventType labels:labels timestamp:timestamp];
         
-        // To avoid internal comScore crashes, we force unique id generation. This might lead to instabilities, as we
-        // discovered, which is why we add a warning message to the logs. This is a test-only behavior, though, and
-        // comScore support will be dropped soon, we therefore don't need a better fix for the moment.
-        SEL selector = NSSelectorFromString(@"generateCrossPublisherUniqueId");
-        void (*methodImp)(id, SEL) = (void (*)(id, SEL))[core methodForSelector:selector];
-        methodImp(core, selector);
-    }
-    
-    // Labels are not complete. To get all labels we mimic the comScore SDK by creating the measurement object. Only the
-    // timestamp will not be identical to the timestamp of the real event which is sent afterwards
-    long long timestamp = [[NSDate date] timeIntervalSince1970];
-    id measurement = [NSClassFromString(@"CSApplicationMeasurement") newWithCore:core eventType:eventType labels:labels timestamp:timestamp];
-    
-    NSMutableDictionary<NSString *, NSString *> *completeLabels = [NSMutableDictionary dictionary];
-    for (id label in [measurement getLabels].allValues) {
-        NSString *name = [label valueForKey:@"name"];
-        NSString *value = [label valueForKey:@"value"];
-        completeLabels[name] = value;
-    }
-    
-    NSDictionary *userInfo = @{ SRGAnalyticsComScoreLabelsKey: [completeLabels copy] };
-    
-    void (^notificationBlock)(void) = ^{
-        [[NSNotificationCenter defaultCenter] postNotificationName:SRGAnalyticsComScoreRequestNotification object:self userInfo:userInfo];
-    };
-    
-    if (! [NSThread isMainThread]) {
-        dispatch_async(dispatch_get_main_queue(), notificationBlock);
+        NSMutableDictionary<NSString *, NSString *> *fullLabels = [NSMutableDictionary dictionary];
+        for (id label in [measurement getLabels].allValues) {
+            NSString *name = [label valueForKey:@"name"];
+            NSString *value = [label valueForKey:@"value"];
+            fullLabels[name] = value;
+        }
+        
+        NSDictionary *userInfo = @{ SRGAnalyticsComScoreLabelsKey : [fullLabels copy] };
+        
+        void (^notificationBlock)(void) = ^{
+            [[NSNotificationCenter defaultCenter] postNotificationName:SRGAnalyticsComScoreRequestNotification object:self userInfo:userInfo];
+        };
+        
+        if (! [NSThread isMainThread]) {
+            dispatch_async(dispatch_get_main_queue(), notificationBlock);
+        }
+        else {
+            notificationBlock();
+        }
     }
     else {
-        notificationBlock();
+        // Call the original implementation
+        [self swizzled_send:eventType labels:labels cache:cache background:background];
     }
 }
 
diff --git a/Framework/Sources/Helpers/NSBundle+SRGAnalytics.h b/Framework/Sources/Helpers/NSBundle+SRGAnalytics.h
index 909c0d6e..a5ee7910 100644
--- a/Framework/Sources/Helpers/NSBundle+SRGAnalytics.h
+++ b/Framework/Sources/Helpers/NSBundle+SRGAnalytics.h
@@ -15,6 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSBundle *)srg_analyticsBundle;
 
+/**
+ *  Return `YES` iff the application bundle corresponds to an AppStore or TestFlight release.
+ */
++ (BOOL)srg_isProductionVersion;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Framework/Sources/Helpers/NSBundle+SRGAnalytics.m b/Framework/Sources/Helpers/NSBundle+SRGAnalytics.m
index 37af3e5a..b891f2eb 100644
--- a/Framework/Sources/Helpers/NSBundle+SRGAnalytics.m
+++ b/Framework/Sources/Helpers/NSBundle+SRGAnalytics.m
@@ -8,6 +8,8 @@
 
 #import "SRGAnalyticsTracker.h"
 
+#import <UIKit/UIKit.h>
+
 @implementation NSBundle (SRGAnalytics)
 
 + (instancetype)srg_analyticsBundle
@@ -20,4 +22,19 @@ + (instancetype)srg_analyticsBundle
     return bundle;
 }
 
++ (BOOL)srg_isProductionVersion
+{
+    // Check SIMULATOR_DEVICE_NAME for iOS 9 and above, device name below
+    if ([NSProcessInfo processInfo].environment[@"SIMULATOR_DEVICE_NAME"]
+            || [[UIDevice currentDevice].name.lowercaseString containsString:@"simulator"]) {
+        return NO;
+    }
+    
+    if ([[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"]) {
+        return NO;
+    }
+    
+    return ([NSBundle mainBundle].appStoreReceiptURL != nil);
+}
+
 @end
diff --git a/Framework/Sources/Helpers/NSDictionary+SRGAnalytics.m b/Framework/Sources/Helpers/NSDictionary+SRGAnalytics.m
deleted file mode 100644
index ccd1ec4f..00000000
--- a/Framework/Sources/Helpers/NSDictionary+SRGAnalytics.m
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  Copyright (c) SRG SSR. All rights reserved.
-//
-//  License information is available from the LICENSE file.
-//
-
-#import "NSDictionary+SRGAnalytics.h"
-
-@implementation NSDictionary (SRGAnalytics)
-
-- (void)safeSetValue:(id)value forKey:(NSString *)key
-{
-    if (value && key) {
-        [self setValue:value forKey:key];
-    }
-}
-
-@end
diff --git a/Framework/Sources/Helpers/NSDictionary+SRGAnalytics.h b/Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.h
similarity index 54%
rename from Framework/Sources/Helpers/NSDictionary+SRGAnalytics.h
rename to Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.h
index 244e107b..6412ff1c 100644
--- a/Framework/Sources/Helpers/NSDictionary+SRGAnalytics.h
+++ b/Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.h
@@ -8,12 +8,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface NSDictionary (SRGAnalytics)
+@interface NSMutableDictionary (SRGAnalytics)
 
 /**
- *  Set value and key iff both are non-`nil`.
+ *  Set string and key iff both are non-`nil`.
  */
-- (void)safeSetValue:(nullable id)value forKey:(nullable NSString *)key;
+- (void)srg_safelySetString:(nullable NSString *)string forKey:(nullable NSString *)key;
 
 @end
 
diff --git a/Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.m b/Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.m
new file mode 100644
index 00000000..ded22309
--- /dev/null
+++ b/Framework/Sources/Helpers/NSMutableDictionary+SRGAnalytics.m
@@ -0,0 +1,21 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "NSMutableDictionary+SRGAnalytics.h"
+
+@implementation NSMutableDictionary (SRGAnalytics)
+
+- (void)srg_safelySetString:(NSString *)string forKey:(NSString *)key
+{
+    if (string && key) {
+        [self setObject:string forKey:key];
+    }
+    else {
+        [self removeObjectForKey:key];
+    }
+}
+
+@end
diff --git a/Framework_DataProvider/SRGAnalytics_DataProvider.h b/Framework_DataProvider/SRGAnalytics_DataProvider.h
index fa575644..b74b9572 100644
--- a/Framework_DataProvider/SRGAnalytics_DataProvider.h
+++ b/Framework_DataProvider/SRGAnalytics_DataProvider.h
@@ -11,4 +11,5 @@
 
 // Public headers.
 #import "SRGMediaPlayerController+SRGAnalytics_DataProvider.h"
+#import "SRGSegment+SRGAnalytics_DataProvider.h"
 #import "SRGSubdivision+SRGAnalytics_DataProvider.h"
diff --git a/Framework_DataProvider/Sources/SRGAnalyticsDataProvider.h b/Framework_DataProvider/Sources/SRGAnalyticsDataProvider.h
index 677fada7..a182ed40 100644
--- a/Framework_DataProvider/Sources/SRGAnalyticsDataProvider.h
+++ b/Framework_DataProvider/Sources/SRGAnalyticsDataProvider.h
@@ -10,7 +10,7 @@
  *  Helper macros for logging.
  */
 #define SRGAnalyticsDataProviderLogVerbose(category, format, ...) SRGLogVerbose(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsDataProviderLogVerbose(category, format, ...)   SRGLogDebug(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsDataProviderLogVerbose(category, format, ...)    SRGLogInfo(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsDataProviderLogVerbose(category, format, ...) SRGLogWarning(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsDataProviderLogVerbose(category, format, ...)   SRGLogError(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsDataProviderLogDebug(category, format, ...)   SRGLogDebug(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsDataProviderLogInfo(category, format, ...)    SRGLogInfo(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsDataProviderLogWarning(category, format, ...) SRGLogWarning(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsDataProviderLogError(category, format, ...)   SRGLogError(@"ch.srgssr.analytics.dataprovider", category, format, ##__VA_ARGS__)
diff --git a/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.h b/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.h
index 73016297..cf4c4c3c 100644
--- a/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.h
+++ b/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.h
@@ -10,9 +10,11 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  Data provider compatibility additions to `SRGMediaPlayerController`.
+ *  Data provider compatibility additions to `SRGMediaPlayerController`. By playing medias with the methods provided
+ *  by this category, playback and analytics metadata is entirely retrieved from the Integration Layer and automatically
+ *  managed without additional work.
  *
- *  For more information about stream measurements, @see SRGMediaPlayerController+SRGAnalytics.h.
+ *  For more information about stream measurements, @see SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h.
  */
 @interface SRGMediaPlayerController (SRGAnalytics_DataProvider)
 
@@ -55,24 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
  *  either by calling `-resume` on it or adding it to a request queue. If no exact match can be found for the specified
  *  settings, a recommended valid setup will be used instead.
  *
- *  @param mediaComposition  The media composition to play.
- *  @param streamingMethod   The streaming method to use. If `SRGStreamingMethodNone` or if the method is not
- *                           found, a recommended method will be used instead.
- *  @param quality           The quality to use. If `SRGQualityNone` or not found, the best available quality
- *                           is used.
- *  @param startBitRate      The bit rate the media should start playing with, in kbps. This parameter is a
- *                           recommendation with no result guarantee, though it should in general be applied. The
- *                           nearest available quality (larger or smaller than the requested size) will be used.
- *                           Usual SRG SSR valid bit ranges vary from 100 to 3000 kbps. Use 0 to start with the
- *                           lowest quality stream.
- *  @param userInfo          Optional dictionary conveying arbitrary information during playback.
- *  @param resume            Set to `YES` if you want the request to be started automatically.
- *  @param completionHandler The completion handler will be called once the player is prepared, or if a request
- *                           error is encountered (it will not be called if the player cannot play the content;
- *                           listen to `SRGMediaPlayerPlaybackDidFailNotification` to catch playback errors).
- *
- *  @return The playback request. If successful, the player will start on the chapter / segment specified by
- *          the media composition. The method might return `nil` if no protocol / quality combination is found.
+ *  For parameter and return value documentation, see above.
  */
 - (nullable SRGRequest *)playMediaComposition:(SRGMediaComposition *)mediaComposition
                  withPreferredStreamingMethod:(SRGStreamingMethod)streamingMethod
diff --git a/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.m b/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.m
index 0f8fc5ac..952750fa 100644
--- a/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.m
+++ b/Framework_DataProvider/Sources/SRGMediaPlayerController+SRGAnalytics_DataProvider.m
@@ -6,13 +6,14 @@
 
 #import "SRGMediaPlayerController+SRGAnalytics_DataProvider.h"
 
+#import "SRGAnalyticsMediaPlayerLogger.h"
 #import "SRGSubdivision+SRGAnalytics_DataProvider.h"
 
 #import <libextobjc/libextobjc.h>
 
 NSString * const SRGAnalyticsMediaPlayerMediaCompositionKey = @"SRGAnalyticsMediaPlayerMediaCompositionKey";
 
-typedef void (^SRGMediaPlayerDataProviderLoadCompletionBlock)(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, NSDictionary<NSString *, NSString *> * _Nullable analyticsLabels, NSError * _Nullable error);
+typedef void (^SRGMediaPlayerDataProviderLoadCompletionBlock)(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, SRGAnalyticsStreamLabels * _Nullable analyticsLabels, NSError * _Nullable error);
 
 @implementation SRGMediaPlayerController (SRGAnalytics_DataProvider)
 
@@ -69,6 +70,10 @@ - (SRGRequest *)loadMediaComposition:(SRGMediaComposition *)mediaComposition
         }
     }];
     SRGResource *resource = [[resources filteredArrayUsingPredicate:predicate] sortedArrayUsingDescriptors:@[sortDescriptor]].firstObject ?: [resources sortedArrayUsingDescriptors:@[sortDescriptor]].firstObject;
+    if (! resource) {
+        SRGAnalyticsMediaPlayerLogError(@"mediaplayer", @"No valid resource could be retrieved");
+        return nil;
+    }
     
     // Use the preferrred start bit rate is set. Currrently only supported by Akamai via a __b__ parameter (the actual
     // bitrate will be rounded to the nearest available quality)
@@ -89,19 +94,34 @@ - (SRGRequest *)loadMediaComposition:(SRGMediaComposition *)mediaComposition
             URL = resource.URL;
         }
         
-        NSMutableDictionary<NSString *, NSString *> *analyticsLabels = [NSMutableDictionary dictionary];
+        SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+        
+        NSMutableDictionary<NSString *, NSString *> *customInfo = [NSMutableDictionary dictionary];
+        if (mediaComposition.analyticsLabels) {
+            [customInfo addEntriesFromDictionary:mediaComposition.analyticsLabels];
+        }
+        if (mediaComposition.mainChapter.analyticsLabels) {
+            [customInfo addEntriesFromDictionary:mediaComposition.mainChapter.analyticsLabels];
+        }
+        if (resource.analyticsLabels) {
+            [customInfo addEntriesFromDictionary:resource.analyticsLabels];
+        }
+        labels.customInfo = [customInfo copy];
+        
+        NSMutableDictionary<NSString *, NSString *> *comScoreCustomInfo = [NSMutableDictionary dictionary];
         if (mediaComposition.comScoreAnalyticsLabels) {
-            [analyticsLabels addEntriesFromDictionary:mediaComposition.comScoreAnalyticsLabels];
+            [comScoreCustomInfo addEntriesFromDictionary:mediaComposition.comScoreAnalyticsLabels];
         }
         if (mediaComposition.mainChapter.comScoreAnalyticsLabels) {
-            [analyticsLabels addEntriesFromDictionary:mediaComposition.mainChapter.comScoreAnalyticsLabels];
+            [comScoreCustomInfo addEntriesFromDictionary:mediaComposition.mainChapter.comScoreAnalyticsLabels];
         }
         if (resource.comScoreAnalyticsLabels) {
-            [analyticsLabels addEntriesFromDictionary:resource.comScoreAnalyticsLabels ];
+            [comScoreCustomInfo addEntriesFromDictionary:resource.comScoreAnalyticsLabels];
         }
+        labels.comScoreCustomInfo = [comScoreCustomInfo copy];
         
         NSInteger index = [chapter.segments indexOfObject:mediaComposition.mainSegment];
-        completionBlock(URL, index, chapter.segments, [analyticsLabels copy], nil);
+        completionBlock(URL, index, chapter.segments, labels, nil);
     }];
     if (resume) {
         [request resume];
@@ -119,7 +139,7 @@ - (SRGRequest *)prepareToPlayMediaComposition:(SRGMediaComposition *)mediaCompos
                                        resume:(BOOL)resume
                             completionHandler:(void (^)(NSError * _Nullable))completionHandler
 {
-    return [self loadMediaComposition:mediaComposition withPreferredStreamingMethod:streamingMethod quality:quality startBitRate:startBitRate resume:resume completionBlock:^(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, NSDictionary<NSString *,NSString *> * _Nullable analyticsLabels, NSError * _Nullable error) {
+    return [self loadMediaComposition:mediaComposition withPreferredStreamingMethod:streamingMethod quality:quality startBitRate:startBitRate resume:resume completionBlock:^(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, SRGAnalyticsStreamLabels * _Nullable analyticsLabels, NSError * _Nullable error) {
         if (error) {
             completionHandler ? completionHandler(error) : nil;
             return;
@@ -140,7 +160,7 @@ - (SRGRequest *)playMediaComposition:(SRGMediaComposition *)mediaComposition
                               resume:(BOOL)resume
                    completionHandler:(void (^)(NSError * _Nullable))completionHandler
 {
-    return [self loadMediaComposition:mediaComposition withPreferredStreamingMethod:streamingMethod quality:quality startBitRate:startBitRate resume:resume completionBlock:^(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, NSDictionary<NSString *,NSString *> * _Nullable analyticsLabels, NSError * _Nullable error) {
+    return [self loadMediaComposition:mediaComposition withPreferredStreamingMethod:streamingMethod quality:quality startBitRate:startBitRate resume:resume completionBlock:^(NSURL * _Nullable URL, NSInteger index, NSArray<id<SRGSegment>> *segments, SRGAnalyticsStreamLabels * _Nullable analyticsLabels, NSError * _Nullable error) {
         if (error) {
             completionHandler ? completionHandler(error) : nil;
             return;
diff --git a/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.h b/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.h
new file mode 100644
index 00000000..8f2f11e2
--- /dev/null
+++ b/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.h
@@ -0,0 +1,17 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGSegment+SRGAnalytics_DataProvider.h"
+
+#import <SRGAnalytics_MediaPlayer/SRGAnalytics_MediaPlayer.h>
+#import <SRGDataProvider/SRGDataProvider.h>
+
+/**
+ *  Standard implementation of analytics for a segment stemming from the SRG DataProvider library.
+ */
+@interface SRGSegment (SRGAnalytics_DataProvider)
+
+@end
diff --git a/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.m b/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.m
new file mode 100644
index 00000000..19ec6e5f
--- /dev/null
+++ b/Framework_DataProvider/Sources/SRGSegment+SRGAnalytics_DataProvider.m
@@ -0,0 +1,21 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGSegment+SRGAnalytics_DataProvider.h"
+
+@implementation SRGSegment (SRGAnalytics_DataProvider)
+
+#pragma mark Overrides
+
+- (SRGAnalyticsStreamLabels *)srg_analyticsLabels
+{
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = self.analyticsLabels;
+    labels.comScoreCustomSegmentInfo = self.comScoreAnalyticsLabels;
+    return labels;
+}
+
+@end
diff --git a/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.h b/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.h
index 2ca8ed1e..830bacbd 100644
--- a/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.h
+++ b/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.h
@@ -8,8 +8,7 @@
 #import <SRGDataProvider/SRGDataProvider.h>
 
 /**
- *  Standard implementation of analytics for subdivision stemming from the data provider library. Chapters
- *  (which are subdivisions as well) can be seen as full-length segments.
+ *  Standard implementation of analytics for subdivision stemming from the data provider library.
  */
 @interface SRGSubdivision (SRGAnalytics_DataProvider) <SRGAnalyticsSegment>
 
diff --git a/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.m b/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.m
index 8b7e0225..f6eacdf7 100644
--- a/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.m
+++ b/Framework_DataProvider/Sources/SRGSubdivision+SRGAnalytics_DataProvider.m
@@ -26,9 +26,12 @@ - (BOOL)srg_isHidden
     return self.hidden;
 }
 
-- (NSDictionary<NSString *,NSString *> *)srg_analyticsLabels
+- (SRGAnalyticsStreamLabels *)srg_analyticsLabels
 {
-    return self.comScoreAnalyticsLabels;
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = self.analyticsLabels;
+    labels.comScoreCustomInfo = self.comScoreAnalyticsLabels;
+    return labels;
 }
 
 @end
diff --git a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h b/Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h
similarity index 76%
rename from Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h
rename to Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h
index 793eae7f..1bd365ab 100644
--- a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h
+++ b/Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h
@@ -4,16 +4,18 @@
 //  License information is available from the LICENSE file.
 //
 
+#import <SRGAnalytics/SRGAnalytics.h>
 #import <SRGMediaPlayer/SRGMediaPlayer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  Stream measurement additions to SRGAnalytics, based on comScore StreamSense. The SRGAnalytics_MediaPlayer framework 
- *  is an optional SRGAnalytics companion framework which can be used to easily measure audio and video consumption in 
- *  applications powered by the SRGMediaPlayer library.
+ *  Streaming measurement additions to SRGAnalytics. The SRGAnalytics_MediaPlayer framework is an optional SRGAnalytics
+ *  companion framework which can be used to easily measure audio and video consumption in applications powered by 
+ *  the SRG MediaPlayer library. If you need to implement streaming measurements for other players, use an instance of
+ *  `SRGAnalyticsStreamTracker`.
  *
- *  When playing a media, two levels of analytics information (labels) are consolidated and sent to comScore:
+ *  When playing a media, two levels of analytics information (labels) are consolidated:
  *    - Labels associated with the content URL being played.
  *    - Labels associated with segment being played, which are merged and might override content URL labels.
  *
@@ -27,35 +29,31 @@ NS_ASSUME_NONNULL_BEGIN
  *
  *  The tracker itself must have been started before any measurements can take place (@see `SRGAnalyticsTracker`).
  * 
- *  By default, provided a tracker has been started, all media players are automatically tracked without any 
+ *  By default, provided a tracker has been started, all SRG MediaPlayer controllers are automatically tracked without any
  *  additional work. You can disable this behavior by setting the `SRGMediaPlayerController` `tracked` property to `NO`.
- *  If you do not want any events to be emitted by a player, you should set this property to `NO` before beginning
- *  playback.
  *
  *  By default, standard SRG playback information (playhead position, type of event, etc.) is sent in stream events.
  *  To supply additional measurement information (e.g. title or duration), you must use custom labels.
  *
- *  ## Custom measurement labels
+ *  ## Additional measurement labels
  *
- *  You can supply additional custom measurement labels with stream events sent from your application. Be careful
- *  when using custom labels, though, and ensure your custom keys do not match reserved values by using appropriate
- *  naming conventions (e.g. a prefix).
+ *  You can supply additional custom measurement labels with stream events sent from your application. These labels
+ *  are provided through `SRGAnalyticsStreamLabels` instances whose properties can be set depending on which information
+ *  is needed.
  *
- *  Custom information can be added to both content and segment labels. When playing a segment, its labels are merged 
+ *  Custom information can be added to both content and segment labels. When playing a segment, its labels are merged
  *  with labels associated with the content, overriding existing keys. You can take advantage of this behavior to add
  *  segment information on top of content labels.
  *  
  *  ### Labels associated with the content
  *
  *  Labels associated with a media being played can be supplied when starting playback, using one of the plaback
- *  methods made available below. Simply pass a dictionary of the content-related labels to be sent in stream
- *  events.
+ *  methods made available below. 
  *
  *  ### Labels associated with a segment
  *
  *  To supply labels for a segment, have your segment model class conform to the `SRGAnalyticsSegment` protocol instead 
- *  of `SRGSegment`, and implement the required `srg_analyticsLabels` method to return the analytics associated with
- *  a segment.
+ *  of `SRGSegment`, and implement the required `srg_analyticsLabels` method.
  */
 @interface SRGMediaPlayerController (SRGAnalytics_MediaPlayer)
 
@@ -68,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)prepareToPlayURL:(NSURL *)URL
                   atTime:(CMTime)time
             withSegments:(nullable NSArray<id<SRGSegment>> *)segments
-         analyticsLabels:(nullable NSDictionary<NSString *, NSString *> *)analyticsLabels
+         analyticsLabels:(nullable SRGAnalyticsStreamLabels *)analyticsLabels
                 userInfo:(nullable NSDictionary *)userInfo
        completionHandler:(nullable void (^)(void))completionHandler;
 
@@ -80,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)playURL:(NSURL *)URL
          atTime:(CMTime)time
    withSegments:(nullable NSArray<id<SRGSegment>> *)segments
-analyticsLabels:(nullable NSDictionary *)analyticsLabels
+analyticsLabels:(nullable SRGAnalyticsStreamLabels *)analyticsLabels
        userInfo:(nullable NSDictionary *)userInfo;
 
 /**
@@ -92,7 +90,7 @@ analyticsLabels:(nullable NSDictionary *)analyticsLabels
 - (void)prepareToPlayURL:(NSURL *)URL
                  atIndex:(NSInteger)index
               inSegments:(NSArray<id<SRGSegment>> *)segments
-     withAnalyticsLabels:(nullable NSDictionary *)analyticsLabels
+     withAnalyticsLabels:(nullable SRGAnalyticsStreamLabels *)analyticsLabels
                 userInfo:(nullable NSDictionary *)userInfo
        completionHandler:(nullable void (^)(void))completionHandler;
 
@@ -104,7 +102,7 @@ analyticsLabels:(nullable NSDictionary *)analyticsLabels
 - (void)playURL:(NSURL *)URL
         atIndex:(NSInteger)index
      inSegments:(NSArray<id<SRGSegment>> *)segments
-withAnalyticsLabels:(nullable NSDictionary *)analyticsLabels
+withAnalyticsLabels:(nullable SRGAnalyticsStreamLabels *)analyticsLabels
        userInfo:(nullable NSDictionary *)userInfo;
 
 /**
@@ -113,7 +111,7 @@ withAnalyticsLabels:(nullable NSDictionary *)analyticsLabels
  *  @discussion Media players are tracked between the time they prepare a media for playback and the time they return to
  *              the idle state. You can start and stop tracking at any time, which will automatically send the required
  *              stream events. If you do not want to track a player at all, be sure that you set this property to `NO`
- *              before starting playback
+ *              before starting playback.
  */
 @property (nonatomic, getter=isTracked) BOOL tracked;
 
diff --git a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m b/Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m
similarity index 73%
rename from Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m
rename to Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m
index fe04ccf4..b368705e 100644
--- a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m
+++ b/Framework_MediaPlayer/Sources/Categories/SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m
@@ -16,7 +16,8 @@ @implementation SRGMediaPlayerController (SRGAnalytics_MediaPlayer)
 
 #pragma mark Helpers
 
-+ (NSDictionary *)fullInfoWithAnalyticsLabels:(NSDictionary<NSString *, NSString *> *)analyticsLabels userInfo:(NSDictionary *)userInfo
++ (NSDictionary *)fullInfoWithAnalyticsLabels:(SRGAnalyticsStreamLabels *)analyticsLabels
+                                     userInfo:(NSDictionary *)userInfo
 {
     NSMutableDictionary *fullUserInfo = [NSMutableDictionary dictionary];
     if (analyticsLabels) {
@@ -32,10 +33,10 @@ + (NSDictionary *)fullInfoWithAnalyticsLabels:(NSDictionary<NSString *, NSString
 
 - (void)prepareToPlayURL:(NSURL *)URL
                   atTime:(CMTime)time
-            withSegments:(nullable NSArray<id<SRGSegment>> *)segments
-         analyticsLabels:(nullable NSDictionary *)analyticsLabels
-                userInfo:(nullable NSDictionary *)userInfo
-       completionHandler:(nullable void (^)(void))completionHandler
+            withSegments:(NSArray<id<SRGSegment>> *)segments
+         analyticsLabels:(SRGAnalyticsStreamLabels *)analyticsLabels
+                userInfo:(NSDictionary *)userInfo
+       completionHandler:(void (^)(void))completionHandler
 {
     NSDictionary *fullUserInfo = [SRGMediaPlayerController fullInfoWithAnalyticsLabels:analyticsLabels userInfo:userInfo];
     [self prepareToPlayURL:URL atTime:time withSegments:segments userInfo:fullUserInfo completionHandler:completionHandler];
@@ -43,9 +44,9 @@ - (void)prepareToPlayURL:(NSURL *)URL
 
 - (void)playURL:(NSURL *)URL
          atTime:(CMTime)time
-   withSegments:(nullable NSArray<id<SRGSegment>> *)segments
-analyticsLabels:(nullable NSDictionary *)analyticsLabels
-       userInfo:(nullable NSDictionary *)userInfo
+   withSegments:(NSArray<id<SRGSegment>> *)segments
+analyticsLabels:(SRGAnalyticsStreamLabels *)analyticsLabels
+       userInfo:(NSDictionary *)userInfo
 {
     NSDictionary *fullUserInfo = [SRGMediaPlayerController fullInfoWithAnalyticsLabels:analyticsLabels userInfo:userInfo];
     [self playURL:URL atTime:time withSegments:segments userInfo:fullUserInfo];
@@ -54,9 +55,9 @@ - (void)playURL:(NSURL *)URL
 - (void)prepareToPlayURL:(NSURL *)URL
                  atIndex:(NSInteger)index
               inSegments:(NSArray<id<SRGSegment>> *)segments
-     withAnalyticsLabels:(nullable NSDictionary *)analyticsLabels
-                userInfo:(nullable NSDictionary *)userInfo
-       completionHandler:(nullable void (^)(void))completionHandler
+     withAnalyticsLabels:(SRGAnalyticsStreamLabels *)analyticsLabels
+                userInfo:(NSDictionary *)userInfo
+       completionHandler:(void (^)(void))completionHandler
 {
     NSDictionary *fullUserInfo = [SRGMediaPlayerController fullInfoWithAnalyticsLabels:analyticsLabels userInfo:userInfo];
     [self prepareToPlayURL:URL atIndex:index inSegments:segments withUserInfo:fullUserInfo completionHandler:completionHandler];
@@ -65,8 +66,8 @@ - (void)prepareToPlayURL:(NSURL *)URL
 - (void)playURL:(NSURL *)URL
         atIndex:(NSInteger)index
      inSegments:(NSArray<id<SRGSegment>> *)segments
-withAnalyticsLabels:(nullable NSDictionary *)analyticsLabels
-       userInfo:(nullable NSDictionary *)userInfo
+withAnalyticsLabels:(SRGAnalyticsStreamLabels *)analyticsLabels
+       userInfo:(NSDictionary *)userInfo
 {
     NSDictionary *fullUserInfo = [SRGMediaPlayerController fullInfoWithAnalyticsLabels:analyticsLabels userInfo:userInfo];
     [self playURL:URL atIndex:index inSegments:segments withUserInfo:fullUserInfo];
diff --git a/Framework_MediaPlayer/Sources/MediaPlayer/SRGAnalyticsMediaPlayerLogger.h b/Framework_MediaPlayer/Sources/MediaPlayer/SRGAnalyticsMediaPlayerLogger.h
deleted file mode 100644
index 46f4b7fa..00000000
--- a/Framework_MediaPlayer/Sources/MediaPlayer/SRGAnalyticsMediaPlayerLogger.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  Copyright (c) SRG SSR. All rights reserved.
-//
-//  License information is available from the LICENSE file.
-//
-
-#import <SRGLogger/SRGLogger.h>
-
-/**
- *  Helper macros for logging.
- */
-#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...) SRGLogVerbose(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...)   SRGLogDebug(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...)    SRGLogInfo(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...) SRGLogWarning(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
-#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...)   SRGLogError(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
diff --git a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.m b/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.m
deleted file mode 100644
index bb2372e1..00000000
--- a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.m
+++ /dev/null
@@ -1,491 +0,0 @@
-//
-//  Copyright (c) SRG SSR. All rights reserved.
-//
-//  License information is available from the LICENSE file.
-//
-
-#import "SRGMediaPlayerTracker.h"
-
-#import "SRGAnalyticsLogger.h"
-#import "SRGAnalyticsSegment.h"
-#import "SRGAnalyticsTracker.h"
-#import "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h"
-
-#import <libextobjc/libextobjc.h>
-#import <MAKVONotificationCenter/MAKVONotificationCenter.h>
-#import <SRGAnalytics/SRGAnalytics.h>
-
-static void *s_kvoContext = &s_kvoContext;
-
-NSString * const SRGAnalyticsMediaPlayerLabelsKey = @"SRGAnalyticsMediaPlayerLabelsKey";
-
-static NSMutableDictionary *s_trackers = nil;
-
-@interface SRGMediaPlayerTracker () {
-@private
-    BOOL _enabled;
-}
-
-// We must not retain the controller, so that its deallocation is not prevented (deallocation will ensure the idle state
-// is always reached before the player gets destroyed, and our tracker is removed when this state is reached). Since
-// returning to the idle state might occur during deallocation, we need a non-weak ref (which would otherwise be nilled
-// and thus not available when the tracker is stopped)
-@property (nonatomic, unsafe_unretained) SRGMediaPlayerController *mediaPlayerController;
-
-// Keep track of the playback time. We would lose this information when the player is reset, but we still need it
-// in associated labels. The easiest is to store this information at the tracker level during playback.
-@property (nonatomic, weak) id periodicTimeObserver;
-@property (nonatomic) long currentPositionInMilliseconds;
-
-@end
-
-@implementation SRGMediaPlayerTracker
-
-#pragma mark Object lifecycle
-
-- (id)initWithMediaPlayerController:(SRGMediaPlayerController *)mediaPlayerController
-{
-    if (self = [super init]) {
-        self.mediaPlayerController = mediaPlayerController;
-        
-        // The default keep-alive time interval of 20 minutes is too big. Set it to 9 minutes
-        [self setKeepAliveInterval:9 * 60];
-    }
-    return self;
-}
-
-- (id)init
-{
-    [self doesNotRecognizeSelector:_cmd];
-    return [self initWithMediaPlayerController:nil];
-}
-
-- (void)dealloc
-{
-    // FIXME: Due to internal comScore bugs, the object will never be properly released. This does not hurt in our implementaton,
-    //        but this could be fixed
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark Getters and setters
-
-- (void)setMediaPlayerController:(SRGMediaPlayerController *)mediaPlayerController
-{
-    [_mediaPlayerController removePeriodicTimeObserver:self.periodicTimeObserver];
-    
-    _mediaPlayerController = mediaPlayerController;
-    
-    @weakify(self)
-    [mediaPlayerController addPeriodicTimeObserverForInterval:CMTimeMakeWithSeconds(1., NSEC_PER_SEC) queue:NULL usingBlock:^(CMTime time) {
-        @strongify(self)
-        
-        // Live stream: Playhead position must be always 0
-        if (self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeLive
-                || self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeDVR) {
-            self.currentPositionInMilliseconds = 0;
-        }
-        else {
-            CMTime currentTime = [self.mediaPlayerController.player.currentItem currentTime];
-            if (CMTIME_IS_INDEFINITE(currentTime) || CMTIME_IS_INVALID(currentTime)) {
-                self.currentPositionInMilliseconds = 0;
-            }
-            else {
-                self.currentPositionInMilliseconds = (long)floor(CMTimeGetSeconds(currentTime) * 1000.);
-            }
-        }
-    }];
-}
-
-#pragma mark Tracker management
-
-- (void)start
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(playbackStateDidChange:)
-                                                 name:SRGMediaPlayerPlaybackStateDidChangeNotification
-                                               object:self.mediaPlayerController];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(segmentDidStart:)
-                                                 name:SRGMediaPlayerSegmentDidStartNotification
-                                               object:self.mediaPlayerController];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(segmentDidEnd:)
-                                                 name:SRGMediaPlayerSegmentDidEndNotification
-                                               object:self.mediaPlayerController];
-    
-    [self notifyEvent:CSStreamSenseBuffer withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey] segment:nil];
-    
-    @weakify(self)
-    [self.mediaPlayerController addObserver:self keyPath:@keypath(SRGMediaPlayerController.new, tracked) options:0 block:^(MAKVONotification *notification) {
-        @strongify(self)
-        
-        // Balance comScore events if the player is playing, so that all events can be properly emitted
-        if (self.mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStatePlaying) {
-            CSStreamSenseEventType event = self.mediaPlayerController.tracked ? CSStreamSensePlay : CSStreamSenseEnd;
-            [self rawNotifyEvent:event
-                      withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                         segment:self.mediaPlayerController.selectedSegment];
-        }
-        else if (self.mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStateSeeking
-                 || self.mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStatePaused) {
-            CSStreamSenseEventType event = self.mediaPlayerController.tracked ? CSStreamSensePlay : CSStreamSenseEnd;
-            [self rawNotifyEvent:event
-                      withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                         segment:self.mediaPlayerController.selectedSegment];
-            
-            // Also send the pause event when starting tracking, so that the current player state is accurately reflected
-            if (self.mediaPlayerController.tracked) {
-                [self rawNotifyEvent:CSStreamSensePause
-                          withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                             segment:self.mediaPlayerController.selectedSegment];
-            }
-        }
-    }];
-}
-
-- (void)stopWithLabels:(NSDictionary *)labels
-{
-    NSAssert(self.mediaPlayerController, @"Media player controller must be available when stopping");
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:SRGMediaPlayerPlaybackStateDidChangeNotification
-                                                  object:self.mediaPlayerController];
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:SRGMediaPlayerSegmentDidStartNotification
-                                                  object:self.mediaPlayerController];
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:SRGMediaPlayerSegmentDidEndNotification
-                                                  object:self.mediaPlayerController];
-    
-    [self notifyEvent:CSStreamSenseEnd withLabels:labels segment:self.mediaPlayerController.selectedSegment];
-    
-    [self.mediaPlayerController removeObserver:self keyPath:@keypath(SRGMediaPlayerController.new, tracked)];
-    
-    self.mediaPlayerController = nil;
-}
-
-#pragma mark Helpers
-
-- (void)safelySetValue:(NSString *)value forLabel:(NSString *)label
-{
-    NSParameterAssert(label);
-    
-    if (value) {
-        [self setLabel:label value:value];
-    }
-    else {
-        [[self labels] removeObjectForKey:label];
-    }
-}
-
-- (void)safelySetValue:(NSString *)value forClipLabel:(NSString *)label
-{
-    NSParameterAssert(label);
-    
-    if (value) {
-        [[self clip] setLabel:label value:value];
-    }
-    else {
-        [[[self clip] labels] removeObjectForKey:label];
-    }
-}
-
-- (void)notifyEvent:(CSStreamSenseEventType)event withLabels:(NSDictionary *)labels segment:(id<SRGSegment>)segment
-{
-    if (! self.mediaPlayerController.tracked) {
-        return;
-    }
-    
-    [self rawNotifyEvent:event withLabels:labels segment:segment];
-}
-
-// Raw notification implementation which does not check whether the tracker is enabled
-- (void)rawNotifyEvent:(CSStreamSenseEventType)event withLabels:(NSDictionary *)labels segment:(id<SRGSegment>)segment
-{
-    // Reset custom stream labels to avoid persistence (do not reset since the stream would behave badly afterwards)
-    [[self labels] removeAllObjects];
-    
-    // Global labels
-    [self safelySetValue:@"SRGMediaPlayer" forLabel:@"ns_st_mp"];
-    [self safelySetValue:SRGAnalyticsMarketingVersion() forLabel:@"ns_st_pu"];
-    [self safelySetValue:SRGMediaPlayerMarketingVersion() forLabel:@"ns_st_mv"];
-    [self safelySetValue:@"c" forLabel:@"ns_st_it"];
-    
-    [self safelySetValue:[SRGAnalyticsTracker sharedTracker].comScoreVirtualSite forLabel:@"ns_vsite"];
-    [self safelySetValue:@"p_app_ios" forLabel:@"srg_ptype"];
-    
-    // Labels
-    [self safelySetValue:[self bitRate] forLabel:@"ns_st_br"];
-    [self safelySetValue:[self windowState] forLabel:@"ns_st_ws"];
-    [self safelySetValue:[self volume] forLabel:@"ns_st_vo"];
-    [self safelySetValue:[self scalingMode] forLabel:@"ns_st_sg"];
-    [self safelySetValue:[self orientation] forLabel:@"ns_ap_ot"];
-    
-    if (labels) {
-        [self setLabels:labels];
-    }
-    
-    // Reset custom clip labels to avoid inheriting from a previous segment. Do not reset otherwise internal hidden
-    // comScore labels (e.g. ns_st_pa) would be incorrect afterwards
-    [[[self clip] labels] removeAllObjects];
-    
-    [self safelySetValue:[self dimensions] forClipLabel:@"ns_st_cs"];
-    [self safelySetValue:[self timeshiftFromLiveInMilliseconds] forClipLabel:@"srg_timeshift"];
-    [self safelySetValue:[self screenType] forClipLabel:@"srg_screen_type"];
-    
-    if ([segment conformsToProtocol:@protocol(SRGAnalyticsSegment)]) {
-        NSDictionary *labels = [(id<SRGAnalyticsSegment>)segment srg_analyticsLabels];
-        if (labels) {
-            [[self clip] setLabels:labels];
-        }
-    }
-    
-    [self notify:event position:self.currentPositionInMilliseconds labels:nil /* already set on the stream and clip objects */];
-}
-
-#pragma mark Playback data
-
-- (NSString *)bitRate
-{
-    AVPlayerItem *currentItem = self.mediaPlayerController.player.currentItem;
-    if (! currentItem) {
-        return nil;
-    }
-    
-    NSArray *events = currentItem.accessLog.events;
-    if (! events.lastObject) {
-        return nil;
-    }
-    
-    double observedBitrate = [events.lastObject observedBitrate];
-    return [@(observedBitrate) stringValue];
-}
-
-- (NSString *)windowState
-{
-    CGSize size = self.mediaPlayerController.playerLayer.videoRect.size;
-    CGRect screenRect = [UIScreen mainScreen].bounds;
-    return roundf(size.width) == roundf(screenRect.size.width) && roundf(size.height) == roundf(screenRect.size.height) ? @"full" : @"norm";
-}
-
-- (NSString *)volume
-{
-    if (self.mediaPlayerController.player && self.mediaPlayerController.player.isMuted) {
-        return @"0";
-    }
-    else {
-        NSInteger volume = [AVAudioSession sharedInstance].outputVolume * 100;
-        return [@(volume) stringValue];
-    }
-}
-
-- (NSString *)scalingMode
-{
-    static NSDictionary *s_gravities;
-    static dispatch_once_t s_onceToken;
-    dispatch_once(&s_onceToken, ^{
-        s_gravities = @{ AVLayerVideoGravityResize: @"fill",
-                         AVLayerVideoGravityResizeAspect : @"fit-a",
-                         AVLayerVideoGravityResizeAspectFill : @"fill-a" };
-    });
-    return s_gravities[self.mediaPlayerController.playerLayer.videoGravity] ?: @"no";
-}
-
-- (NSString *)orientation
-{
-    static NSDictionary *s_orientations;
-    static dispatch_once_t s_onceToken;
-    dispatch_once(&s_onceToken, ^{
-        s_orientations = @{ @(UIDeviceOrientationFaceDown) : @"facedown",
-                            @(UIDeviceOrientationFaceUp) : @"faceup",
-                            @(UIDeviceOrientationPortrait) : @"pt",
-                            @(UIDeviceOrientationPortraitUpsideDown) : @"updown",
-                            @(UIDeviceOrientationLandscapeLeft) : @"left",
-                            @(UIDeviceOrientationLandscapeRight) : @"right" };
-    });
-    return s_orientations[@([UIDevice currentDevice].orientation)];
-}
-
-- (NSString *)dimensions
-{
-    CGSize size = self.mediaPlayerController.playerLayer.videoRect.size;
-    return [NSString stringWithFormat:@"%0.fx%0.f", size.width, size.height];
-}
-
-- (NSString *)timeshiftFromLiveInMilliseconds
-{
-    // Do not return any value for non-live streams
-    if (self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeDVR) {
-        CMTime timeShift = CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), self.mediaPlayerController.player.currentItem.currentTime);
-        NSInteger timeShiftInSeconds = (NSInteger)fabs(CMTimeGetSeconds(timeShift));
-        
-        // Consider offsets smaller than the tolerance to be equivalent to live conditions, sending 0 instead of the real offset
-        if (timeShiftInSeconds <= self.mediaPlayerController.liveTolerance) {
-            return @"0";
-        }
-        else {
-            return [@(timeShiftInSeconds * 1000) stringValue];
-        }
-    }
-    else if (self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeLive) {
-        return @"0";
-    }
-    else {
-        return nil;
-    }
-}
-
-- (NSString *)airplay
-{
-    return self.mediaPlayerController.player.isExternalPlaybackActive ? @"1" : @"0";
-}
-
-- (NSString *)screenType
-{
-    if (self.mediaPlayerController.pictureInPictureController.pictureInPictureActive) {
-        return @"pip";
-    }
-    else if (self.mediaPlayerController.player.isExternalPlaybackActive) {
-        return @"airplay";
-    }
-    else {
-        return @"default";
-    }
-}
-
-#pragma mark Notifications
-
-+ (void)playbackStateDidChange:(NSNotification *)notification
-{
-    // Avoid calling comScore methods when the tracker is not started (which usually leads to crashes because the virtual
-    // site has not been set)
-    if (! [SRGAnalyticsTracker sharedTracker].started) {
-        return;
-    }
-    
-    SRGMediaPlayerController *mediaPlayerController = notification.object;
-    
-    NSValue *key = [NSValue valueWithNonretainedObject:mediaPlayerController];
-    if (mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStatePreparing) {
-        NSAssert(s_trackers[key] == nil, @"No tracker must exist");
-        SRGMediaPlayerTracker *tracker = [[SRGMediaPlayerTracker alloc] initWithMediaPlayerController:mediaPlayerController];
-        
-        s_trackers[key] = tracker;
-        if (s_trackers.count == 1) {
-            [CSComScore onUxActive];
-        }
-        
-        [tracker start];
-        
-        SRGAnalyticsLogInfo(@"PlayerTracker", @"Started tracking for %@", key);
-    }
-    else if (mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStateIdle) {
-        SRGMediaPlayerTracker *tracker = s_trackers[key];
-        NSAssert(tracker != nil, @"A tracker must exist");
-        
-        NSDictionary *previousUserInfo = notification.userInfo[SRGMediaPlayerPreviousUserInfoKey];
-        [tracker stopWithLabels:previousUserInfo[SRGAnalyticsMediaPlayerLabelsKey]];
-        
-        [s_trackers removeObjectForKey:key];
-        if (s_trackers.count == 0) {
-            [CSComScore onUxInactive];
-        }
-        
-        SRGAnalyticsLogInfo(@"PlayerTracker", @"Stopped tracking for %@", key);
-    }
-}
-
-- (void)playbackStateDidChange:(NSNotification *)notification
-{
-    // Inhibit usual playback transitions occuring during segment selection
-    if ([notification.userInfo[SRGMediaPlayerSelectionKey] boolValue]) {
-        return;
-    }
-    
-    CSStreamSenseEventType event;
-    switch (self.mediaPlayerController.playbackState) {
-        case SRGMediaPlayerPlaybackStatePlaying: {
-            event = CSStreamSensePlay;
-            break;
-        }
-            
-        case SRGMediaPlayerPlaybackStateSeeking:
-        case SRGMediaPlayerPlaybackStatePaused: {
-            event = CSStreamSensePause;
-            break;
-        }
-            
-        case SRGMediaPlayerPlaybackStateStalled: {
-            event = CSStreamSenseBuffer;
-            break;
-        }
-            
-        case SRGMediaPlayerPlaybackStateEnded: {
-            event = CSStreamSenseEnd;
-            break;
-        }
-            
-        default: {
-            return;
-            break;
-        }
-    }
-    
-    [self notifyEvent:event
-           withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-              segment:self.mediaPlayerController.selectedSegment];
-}
-
-- (void)segmentDidStart:(NSNotification *)notification
-{
-    // Only send analytics for segment selections
-    if ([notification.userInfo[SRGMediaPlayerSelectionKey] boolValue]) {
-        id<SRGSegment> segment = notification.userInfo[SRGMediaPlayerSegmentKey];
-        
-        // Notify full-length end (only if not starting at the given segment, i.e. if the player is not preparing playback)
-        id<SRGSegment> previousSegment = notification.userInfo[SRGMediaPlayerPreviousSegmentKey];
-        if (! previousSegment && self.mediaPlayerController.playbackState != SRGMediaPlayerPlaybackStatePreparing) {
-            [self notifyEvent:CSStreamSenseEnd
-                   withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                      segment:nil];
-        }
-        
-        [self notifyEvent:CSStreamSensePlay
-               withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                  segment:segment];
-    }
-}
-
-- (void)segmentDidEnd:(NSNotification *)notification
-{
-    // Only send analytics for segments which were selected
-    if ([notification.userInfo[SRGMediaPlayerSelectedKey] boolValue]) {
-        id<SRGSegment> segment = notification.userInfo[SRGMediaPlayerSegmentKey];
-        
-        [self notifyEvent:CSStreamSenseEnd
-               withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                  segment:segment];
-        
-        // Notify full-length start if the transition was not due to another segment being selected
-        if (! [notification.userInfo[SRGMediaPlayerSelectionKey] boolValue] && self.mediaPlayerController.playbackState != SRGMediaPlayerPlaybackStateEnded) {
-            [self notifyEvent:CSStreamSensePlay
-                   withLabels:self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey]
-                      segment:nil];
-        }
-    }
-}
-    
-@end
-
-#pragma mark Static functions
-
-__attribute__((constructor)) static void SRGMediaPlayerTrackerInit(void)
-{
-    // Observe state changes for all media player controllers to create and remove trackers on the fly
-    [[NSNotificationCenter defaultCenter] addObserver:[SRGMediaPlayerTracker class]
-                                             selector:@selector(playbackStateDidChange:)
-                                                 name:SRGMediaPlayerPlaybackStateDidChangeNotification
-                                               object:nil];
-    
-    s_trackers = [NSMutableDictionary dictionary];
-}
diff --git a/Framework_MediaPlayer/Sources/Protocols/SRGAnalyticsSegment.h b/Framework_MediaPlayer/Sources/Protocols/SRGAnalyticsSegment.h
index 74d80477..138e64b8 100644
--- a/Framework_MediaPlayer/Sources/Protocols/SRGAnalyticsSegment.h
+++ b/Framework_MediaPlayer/Sources/Protocols/SRGAnalyticsSegment.h
@@ -5,6 +5,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <SRGAnalytics/SRGAnalytics.h>
 #import <SRGMediaplayer/SRGSegment.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -12,14 +13,14 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  Protocol for segments conveying analytics information.
  *
- *  For more information, @see SRGMediaPlayerController+SRGAnalytics.h.
+ *  For more information, @see SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h.
  */
 @protocol SRGAnalyticsSegment <SRGSegment>
 
 /**
- *  Analytics labels associated with the segments.
+ *  Analytics labels associated with the segment.
  */
-@property (nonatomic, readonly, nullable) NSDictionary<NSString *, NSString *> *srg_analyticsLabels;
+@property (nonatomic, readonly, nullable) SRGAnalyticsStreamLabels *srg_analyticsLabels;
 
 @end
 
diff --git a/Framework_MediaPlayer/Sources/SRGAnalyticsMediaPlayerLogger.h b/Framework_MediaPlayer/Sources/SRGAnalyticsMediaPlayerLogger.h
new file mode 100644
index 00000000..39fa3d13
--- /dev/null
+++ b/Framework_MediaPlayer/Sources/SRGAnalyticsMediaPlayerLogger.h
@@ -0,0 +1,16 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import <SRGLogger/SRGLogger.h>
+
+/**
+ *  Helper macros for logging.
+ */
+#define SRGAnalyticsMediaPlayerLogVerbose(category, format, ...) SRGLogVerbose(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsMediaPlayerLogDebug(category, format, ...)   SRGLogDebug(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsMediaPlayerLogInfo(category, format, ...)    SRGLogInfo(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsMediaPlayerLogWarning(category, format, ...) SRGLogWarning(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
+#define SRGAnalyticsMediaPlayerLogError(category, format, ...)   SRGLogError(@"ch.srgssr.analytics.mediaplayer", category, format, ##__VA_ARGS__)
diff --git a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.h b/Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.h
similarity index 67%
rename from Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.h
rename to Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.h
index a0e74060..c3949ca2 100644
--- a/Framework_MediaPlayer/Sources/MediaPlayer/SRGMediaPlayerTracker.h
+++ b/Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.h
@@ -4,20 +4,20 @@
 //  License information is available from the LICENSE file.
 //
 
-#import <ComScore/ComScore.h>
+#import <SRGAnalytics/SRGAnalytics.h>
 #import <SRGMediaPlayer/SRGMediaPlayer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-// Key under which media player labels are stored in the media player controller user information.
+// Key under which media player labels are stored in the media player controller user information (as `SRGAnalyticsStreamLabels`).
 OBJC_EXTERN NSString * const SRGAnalyticsMediaPlayerLabelsKey;
 
 /**
- *  The media player tracker class internally listens to media player controller notifications to provide automatic
+ *  The media player tracker class internally listens to SRG MediaPlayer controller notifications to provide automatic
  *  tracking of media consumption. A tracker is automatically associated with a player controller when it prepares
  *  to play, and is removed when the player returns to the idle state.
  */
-@interface SRGMediaPlayerTracker : CSStreamSense
+@interface SRGMediaPlayerTracker : NSObject <SRGAnalyticsStreamTrackerDelegate>
 
 @end
 
diff --git a/Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.m b/Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.m
new file mode 100644
index 00000000..828b4bb6
--- /dev/null
+++ b/Framework_MediaPlayer/Sources/SRGMediaPlayerTracker.m
@@ -0,0 +1,475 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SRGMediaPlayerTracker.h"
+
+#import "NSMutableDictionary+SRGAnalytics.h"
+#import "SRGAnalyticsLogger.h"
+#import "SRGAnalyticsSegment.h"
+#import "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h"
+
+#import <ComScore/ComScore.h>
+#import <libextobjc/libextobjc.h>
+#import <MAKVONotificationCenter/MAKVONotificationCenter.h>
+
+static void *s_kvoContext = &s_kvoContext;
+
+NSString * const SRGAnalyticsMediaPlayerLabelsKey = @"SRGAnalyticsMediaPlayerLabelsKey";
+
+static long SRGAnalyticsCMTimeToMilliseconds(CMTime time)
+{
+    return (long)fmax(floor(CMTimeGetSeconds(time) * 1000.), 0.);
+}
+
+static SRGAnalyticsStreamState SRGAnalyticsStreamStateForPlaybackState(SRGMediaPlayerPlaybackState playbackState)
+{
+    static dispatch_once_t s_onceToken;
+    static NSDictionary<NSNumber *, NSNumber *> *s_playerStates;
+    dispatch_once(&s_onceToken, ^{
+        s_playerStates = @{ @(SRGMediaPlayerPlaybackStateIdle) : @(SRGAnalyticsStreamStateStopped),
+                            @(SRGMediaPlayerPlaybackStatePlaying) : @(SRGAnalyticsStreamStatePlaying),
+                            @(SRGMediaPlayerPlaybackStateSeeking) : @(SRGAnalyticsStreamStateSeeking),
+                            @(SRGMediaPlayerPlaybackStatePaused) : @(SRGAnalyticsStreamStatePaused),
+                            @(SRGMediaPlayerPlaybackStateEnded) : @(SRGAnalyticsStreamStateEnded) };
+    });
+    return s_playerStates[@(playbackState)].integerValue;
+}
+
+static NSMutableDictionary *s_trackers = nil;
+
+@interface SRGMediaPlayerTracker () {
+@private
+    BOOL _enabled;
+}
+
+@property (nonatomic) SRGAnalyticsStreamTracker *streamTracker;
+
+// We must not retain the controller, so that its deallocation is not prevented (deallocation will ensure the idle state
+// is always reached before the player gets destroyed, and our tracker is removed when this state is reached). Since
+// returning to the idle state might occur during deallocation, we need a non-weak ref (which would otherwise be nilled
+// and thus not available when the tracker is stopped)
+@property (nonatomic, unsafe_unretained) SRGMediaPlayerController *mediaPlayerController;
+
+@end
+
+@implementation SRGMediaPlayerTracker
+
+#pragma mark Object lifecycle
+
+- (id)initWithMediaPlayerController:(SRGMediaPlayerController *)mediaPlayerController
+{
+    if (self = [super init]) {
+        self.mediaPlayerController = mediaPlayerController;
+    }
+    return self;
+}
+
+- (id)init
+{
+    [self doesNotRecognizeSelector:_cmd];
+    return [self initWithMediaPlayerController:nil];
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+#pragma mark Tracking
+
+- (void)start
+{
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(playbackStateDidChange:)
+                                                 name:SRGMediaPlayerPlaybackStateDidChangeNotification
+                                               object:self.mediaPlayerController];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(segmentDidStart:)
+                                                 name:SRGMediaPlayerSegmentDidStartNotification
+                                               object:self.mediaPlayerController];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(segmentDidEnd:)
+                                                 name:SRGMediaPlayerSegmentDidEndNotification
+                                               object:self.mediaPlayerController];
+    
+    @weakify(self)
+    [self.mediaPlayerController addObserver:self keyPath:@keypath(SRGMediaPlayerController.new, tracked) options:0 block:^(MAKVONotification *notification) {
+        @strongify(self)
+        
+        SRGAnalyticsStreamState state = SRGAnalyticsStreamStateForPlaybackState(self.mediaPlayerController.playbackState);
+        [self updateWithState:state
+                     position:[self currentPositionInMilliseconds]
+                      segment:self.mediaPlayerController.selectedSegment
+                     userInfo:nil];
+    }];
+}
+
+- (void)stop
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:SRGMediaPlayerPlaybackStateDidChangeNotification
+                                                  object:self.mediaPlayerController];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:SRGMediaPlayerSegmentDidStartNotification
+                                                  object:self.mediaPlayerController];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:SRGMediaPlayerSegmentDidEndNotification
+                                                  object:self.mediaPlayerController];
+    
+    [self.mediaPlayerController removeObserver:self keyPath:@keypath(SRGMediaPlayerController.new, tracked)];
+}
+
+- (void)updateWithState:(SRGAnalyticsStreamState)state position:(NSTimeInterval)position segment:(id<SRGSegment>)segment userInfo:(NSDictionary *)userInfo
+{
+    SRGAnalyticsStreamLabels *fullLabels = [self labelsWithSegment:segment userInfo:userInfo];
+    
+    if (self.mediaPlayerController.tracked && state != SRGAnalyticsStreamStateStopped) {
+        if (! self.streamTracker) {
+            BOOL isLivestream = (self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeLive || self.mediaPlayerController.streamType == SRGMediaPlayerStreamTypeDVR);
+            self.streamTracker = [[SRGAnalyticsStreamTracker alloc] initForLivestream:isLivestream];
+            self.streamTracker.delegate = self;
+        }
+        
+        [self.streamTracker updateWithStreamState:state position:position labels:fullLabels];
+    }
+    else {
+        [self.streamTracker updateWithStreamState:SRGAnalyticsStreamStateStopped position:position labels:fullLabels];
+        self.streamTracker = nil;
+    }
+}
+
+- (SRGAnalyticsStreamLabels *)labelsWithSegment:(id<SRGSegment>)segment userInfo:(NSDictionary *)userInfo
+{
+    SRGAnalyticsStreamLabels *playerLabels = [[SRGAnalyticsStreamLabels alloc] init];
+    playerLabels.playerName = @"SRGMediaPlayer";
+    playerLabels.playerVersion = SRGMediaPlayerMarketingVersion();
+    
+    AVPlayerItem *playerItem = self.mediaPlayerController.player.currentItem;
+    AVMediaSelectionGroup *legibleGroup = [playerItem.asset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicLegible];
+    AVMediaSelectionOption *currentLegibleOption = [playerItem selectedMediaOptionInMediaSelectionGroup:legibleGroup];
+    playerLabels.subtitlesEnabled = @(currentLegibleOption != nil);
+    
+    if (userInfo) {
+        playerLabels.timeshiftInMilliseconds = [self timeshiftInMillisecondsForStreamType:[userInfo[SRGMediaPlayerPreviousStreamTypeKey] integerValue]
+                                                                                timeRange:[userInfo[SRGMediaPlayerPreviousTimeRangeKey] CMTimeRangeValue]
+                                                                              currentTime:[userInfo[SRGMediaPlayerLastPlaybackTimeKey] CMTimeValue]];
+    }
+    else {
+        playerLabels.timeshiftInMilliseconds = [self timeshiftInMilliseconds];
+    }
+    playerLabels.bandwidthInBitsPerSecond = [self bandwidthInBitsPerSecond];
+    playerLabels.playerVolumeInPercent = [self playerVolumeInPercent];
+    
+    // comScore-only labels
+    NSMutableDictionary<NSString *, NSString *> *comScoreCustomInfo = [NSMutableDictionary dictionary];
+    [comScoreCustomInfo srg_safelySetString:[self windowState] forKey:@"ns_st_ws"];
+    [comScoreCustomInfo srg_safelySetString:[self scalingMode] forKey:@"ns_st_sg"];
+    [comScoreCustomInfo srg_safelySetString:[self orientation] forKey:@"ns_ap_ot"];
+    playerLabels.comScoreCustomInfo = [comScoreCustomInfo copy];
+    
+    // comScore-only clip labels
+    NSMutableDictionary<NSString *, NSString *> *comScoreCustomSegmentInfo = [NSMutableDictionary dictionary];
+    [comScoreCustomSegmentInfo srg_safelySetString:[self dimensions] forKey:@"ns_st_cs"];
+    [comScoreCustomSegmentInfo srg_safelySetString:[self screenType] forKey:@"srg_screen_type"];
+    playerLabels.comScoreCustomSegmentInfo = [comScoreCustomSegmentInfo copy];
+    
+    SRGAnalyticsStreamLabels *originalLabels = nil;
+    if (userInfo) {
+        NSDictionary *previousUserInfo = userInfo[SRGMediaPlayerPreviousUserInfoKey];
+        originalLabels = previousUserInfo[SRGAnalyticsMediaPlayerLabelsKey];
+    }
+    else {
+        originalLabels = self.mediaPlayerController.userInfo[SRGAnalyticsMediaPlayerLabelsKey];
+    }
+    SRGAnalyticsStreamLabels *fullLabels = [originalLabels copy] ?: [[SRGAnalyticsStreamLabels alloc] init];
+    [fullLabels mergeWithLabels:playerLabels];
+    
+    if ([segment conformsToProtocol:@protocol(SRGAnalyticsSegment)]) {
+        SRGAnalyticsStreamLabels *segmentLabels = [(id<SRGAnalyticsSegment>)segment srg_analyticsLabels];
+        [fullLabels mergeWithLabels:segmentLabels];
+    }
+    
+    return fullLabels;
+}
+
+#pragma mark Playback information
+
+- (NSNumber *)bandwidthInBitsPerSecond
+{
+    AVPlayerItem *currentItem = self.mediaPlayerController.player.currentItem;
+    if (! currentItem) {
+        return nil;
+    }
+    
+    NSArray<AVPlayerItemAccessLogEvent *> *events = currentItem.accessLog.events;
+    if (! events.lastObject) {
+        return nil;
+    }
+    
+    double observedBitrate = events.lastObject.observedBitrate;
+    return @(observedBitrate);
+}
+
+- (NSString *)windowState
+{
+    CGSize size = self.mediaPlayerController.playerLayer.videoRect.size;
+    CGRect screenRect = [UIScreen mainScreen].bounds;
+    return roundf(size.width) == roundf(screenRect.size.width) && roundf(size.height) == roundf(screenRect.size.height) ? @"full" : @"norm";
+}
+
+- (NSNumber *)playerVolumeInPercent
+{
+    // AVPlayer has a volume property, but its purpose is NOT end-user volume control (see documentation). This volume is
+    // therefore not relevant for our calculations.
+    AVPlayer *player = self.mediaPlayerController.player;
+    if (! player || player.muted) {
+        return nil;
+    }
+    // When we have a non-muted player, its volume is simply the system volume (note that this volume does not take
+    // into account the ringer status).
+    else {
+        NSInteger volume = [AVAudioSession sharedInstance].outputVolume * 100;
+        return @(volume);
+    }
+}
+
+- (NSString *)scalingMode
+{
+    static NSDictionary<NSString *, NSString *> *s_gravities;
+    static dispatch_once_t s_onceToken;
+    dispatch_once(&s_onceToken, ^{
+        s_gravities = @{ AVLayerVideoGravityResize: @"fill",
+                         AVLayerVideoGravityResizeAspect : @"fit-a",
+                         AVLayerVideoGravityResizeAspectFill : @"fill-a" };
+    });
+    return s_gravities[self.mediaPlayerController.playerLayer.videoGravity] ?: @"no";
+}
+
+- (NSString *)orientation
+{
+    static NSDictionary<NSNumber *, NSString *> *s_orientations;
+    static dispatch_once_t s_onceToken;
+    dispatch_once(&s_onceToken, ^{
+        s_orientations = @{ @(UIDeviceOrientationFaceDown) : @"facedown",
+                            @(UIDeviceOrientationFaceUp) : @"faceup",
+                            @(UIDeviceOrientationPortrait) : @"pt",
+                            @(UIDeviceOrientationPortraitUpsideDown) : @"updown",
+                            @(UIDeviceOrientationLandscapeLeft) : @"left",
+                            @(UIDeviceOrientationLandscapeRight) : @"right" };
+    });
+    return s_orientations[@([UIDevice currentDevice].orientation)];
+}
+
+- (NSString *)dimensions
+{
+    CGSize size = self.mediaPlayerController.playerLayer.videoRect.size;
+    return [NSString stringWithFormat:@"%0.fx%0.f", size.width, size.height];
+}
+
+- (NSNumber *)timeshiftInMilliseconds
+{
+    return [self timeshiftInMillisecondsForStreamType:self.mediaPlayerController.streamType
+                                            timeRange:self.mediaPlayerController.timeRange
+                                          currentTime:self.mediaPlayerController.player.currentItem.currentTime];
+}
+
+- (NSNumber *)timeshiftInMillisecondsForStreamType:(SRGMediaPlayerStreamType)streamType timeRange:(CMTimeRange)timeRange currentTime:(CMTime)currentTime
+{
+    // Do not return any value for non-live streams
+    if (streamType == SRGMediaPlayerStreamTypeDVR) {
+        CMTime timeShift = CMTimeSubtract(CMTimeRangeGetEnd(timeRange), currentTime);
+        NSInteger timeShiftInSeconds = (NSInteger)fabs(CMTimeGetSeconds(timeShift));
+        
+        // Consider offsets smaller than the tolerance to be equivalent to live conditions, sending 0 instead of the real offset
+        if (timeShiftInSeconds <= self.mediaPlayerController.liveTolerance) {
+            return @0;
+        }
+        else {
+            return @(timeShiftInSeconds * 1000);
+        }
+    }
+    else if (streamType == SRGMediaPlayerStreamTypeLive) {
+        return @0;
+    }
+    else {
+        return nil;
+    }
+}
+
+- (NSString *)airplay
+{
+    return self.mediaPlayerController.player.isExternalPlaybackActive ? @"1" : @"0";
+}
+
+- (NSString *)screenType
+{
+    if (self.mediaPlayerController.pictureInPictureController.pictureInPictureActive) {
+        return @"pip";
+    }
+    else if (self.mediaPlayerController.player.isExternalPlaybackActive) {
+        return @"airplay";
+    }
+    else {
+        return @"default";
+    }
+}
+
+- (long)currentPositionInMilliseconds
+{
+    CMTime currentTime = [self.mediaPlayerController.player.currentItem currentTime];
+    if (CMTIME_IS_INDEFINITE(currentTime) || CMTIME_IS_INVALID(currentTime)) {
+        return 0;
+    }
+    else {
+        return SRGAnalyticsCMTimeToMilliseconds(currentTime);
+    }
+}
+
+#pragma mark SRGAnalyticsStreamTrackerDelegate protocol
+
+- (BOOL)streamTrackerIsPlayingLive:(SRGAnalyticsStreamTracker *)tracker
+{
+    return self.mediaPlayerController.live;
+}
+
+- (NSTimeInterval)positionForStreamTracker:(SRGAnalyticsStreamTracker *)tracker
+{
+    return [self currentPositionInMilliseconds];
+}
+
+- (SRGAnalyticsStreamLabels *)labelsForStreamTracker:(SRGAnalyticsStreamTracker *)tracker
+{
+    return [self labelsWithSegment:self.mediaPlayerController.selectedSegment userInfo:nil];
+}
+
+#pragma mark Notifications
+
++ (void)playbackStateDidChange:(NSNotification *)notification
+{
+    if (! [SRGAnalyticsTracker sharedTracker].configuration) {
+        return;
+    }
+    
+    SRGMediaPlayerController *mediaPlayerController = notification.object;
+    
+    NSValue *key = [NSValue valueWithNonretainedObject:mediaPlayerController];
+    if (mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStatePreparing) {
+        SRGMediaPlayerTracker *tracker = [[SRGMediaPlayerTracker alloc] initWithMediaPlayerController:mediaPlayerController];
+        
+        s_trackers[key] = tracker;
+        if (s_trackers.count == 1) {
+            [CSComScore onUxActive];
+        }
+        
+        [tracker start];
+        
+        SRGAnalyticsLogInfo(@"PlayerTracker", @"Started tracking for %@", key);
+    }
+    else if (mediaPlayerController.playbackState == SRGMediaPlayerPlaybackStateIdle) {
+        SRGMediaPlayerTracker *tracker = s_trackers[key];
+        if (tracker) {
+            NSTimeInterval lastPosition = SRGAnalyticsCMTimeToMilliseconds([notification.userInfo[SRGMediaPlayerLastPlaybackTimeKey] CMTimeValue]);
+            [tracker updateWithState:SRGAnalyticsStreamStateStopped
+                            position:lastPosition
+                             segment:mediaPlayerController.selectedSegment
+                            userInfo:notification.userInfo];
+            [tracker stop];
+            
+            [s_trackers removeObjectForKey:key];
+            if (s_trackers.count == 0) {
+                [CSComScore onUxInactive];
+            }
+            
+            SRGAnalyticsLogInfo(@"PlayerTracker", @"Stopped tracking for %@", key);
+        }
+    }
+}
+
+- (void)playbackStateDidChange:(NSNotification *)notification
+{
+    SRGMediaPlayerController *mediaPlayerController = self.mediaPlayerController;
+    SRGMediaPlayerPlaybackState playbackState = mediaPlayerController.playbackState;
+    NSAssert(playbackState != SRGMediaPlayerPlaybackStateIdle && playbackState != SRGMediaPlayerPlaybackStatePreparing, @"Notification registrations are managed in idle and preparing states and should therefore not be recorded as notification");
+    
+    // Inhibit usual playback transitions occuring during segment selection
+    if ([notification.userInfo[SRGMediaPlayerSelectionKey] boolValue]) {
+        return;
+    }
+    
+    [self updateWithState:SRGAnalyticsStreamStateForPlaybackState(playbackState)
+                 position:[self currentPositionInMilliseconds]
+                  segment:mediaPlayerController.selectedSegment
+                 userInfo:nil];
+}
+
+- (void)segmentDidStart:(NSNotification *)notification
+{
+    // Only send analytics for segment selections
+    if ([notification.userInfo[SRGMediaPlayerSelectionKey] boolValue]) {
+        id<SRGSegment> segment = notification.userInfo[SRGMediaPlayerSegmentKey];
+        
+        // Notify full-length end (only if not starting at the given segment, i.e. if the player is not preparing playback)
+        id<SRGSegment> previousSegment = notification.userInfo[SRGMediaPlayerPreviousSegmentKey];
+        if (! previousSegment && self.mediaPlayerController.playbackState != SRGMediaPlayerPlaybackStatePreparing) {
+            NSTimeInterval lastPosition = SRGAnalyticsCMTimeToMilliseconds([notification.userInfo[SRGMediaPlayerLastPlaybackTimeKey] CMTimeValue]);
+            [self updateWithState:SRGAnalyticsStreamStateStopped
+                         position:lastPosition
+                          segment:nil
+                         userInfo:nil];
+        }
+        
+        [self updateWithState:SRGAnalyticsStreamStatePlaying
+                     position:[self currentPositionInMilliseconds]
+                      segment:segment
+                     userInfo:nil];
+    }
+}
+
+- (void)segmentDidEnd:(NSNotification *)notification
+{
+    // Only send analytics for segments which were selected
+    if ([notification.userInfo[SRGMediaPlayerSelectedKey] boolValue]) {
+        id<SRGSegment> segment = notification.userInfo[SRGMediaPlayerSegmentKey];
+        NSValue *lastPlaybackTimeValue = notification.userInfo[SRGMediaPlayerLastPlaybackTimeKey];
+        NSTimeInterval lastPositionInMilliseconds = SRGAnalyticsCMTimeToMilliseconds([lastPlaybackTimeValue CMTimeValue]);
+        
+        // Notify full-length start if the transition was not due to another segment being selected
+        if (! [notification.userInfo[SRGMediaPlayerSelectionKey] boolValue] && self.mediaPlayerController.playbackState != SRGMediaPlayerPlaybackStateEnded) {
+            SRGAnalyticsStreamState endState = [notification.userInfo[SRGMediaPlayerInterruptionKey] boolValue] ? SRGAnalyticsStreamStateStopped : SRGAnalyticsStreamStateEnded;
+            NSTimeInterval endPosition = (endState == SRGAnalyticsStreamStateStopped) ? lastPositionInMilliseconds : [self currentPositionInMilliseconds];
+            
+            [self updateWithState:endState
+                         position:endPosition
+                          segment:segment
+                         userInfo:nil];
+            [self updateWithState:SRGAnalyticsStreamStatePlaying
+                         position:[self currentPositionInMilliseconds]
+                          segment:nil
+                         userInfo:nil];
+        }
+        else {
+            [self updateWithState:SRGAnalyticsStreamStateStopped
+                         position:lastPositionInMilliseconds
+                          segment:segment
+                         userInfo:nil];
+        }
+    }
+}
+
+@end
+
+#pragma mark Static functions
+
+__attribute__((constructor)) static void SRGMediaPlayerTrackerInit(void)
+{
+    // Observe state changes for all media player controllers to create and remove trackers on the fly
+    [[NSNotificationCenter defaultCenter] addObserver:[SRGMediaPlayerTracker class]
+                                             selector:@selector(playbackStateDidChange:)
+                                                 name:SRGMediaPlayerPlaybackStateDidChangeNotification
+                                               object:nil];
+    
+    s_trackers = [NSMutableDictionary dictionary];
+}
diff --git a/README.md b/README.md
index 0046f3d7..ef0abe84 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,20 @@
 
 The SRG Analytics library for iOS makes it easy to add usage tracking information to your applications, following the SRG SSR standards.
 
-Measurements are based on events emitted by the application, and collected by comScore and NetMetrix. Currently, the following kinds of events are supported
+Measurements are based on events emitted by the application and collected by TagCommander, comScore and NetMetrix. 
+
+comScore will be soon discontinued and replaced with TagCommander, though. During a transition period, both solutions will coexist to ensure that measurements, currently performed entirely with comScore, will remain consistent after migration to the TagCommander service.
+
+The SRG Analytics library supports three kinds of measurements:
 
  * View events: Appearance of views (page views), which makes it possible to track which content is seen by users.
- * Hidden events: Custom events which can be used for measuresement of application functionalities.
- * Media playback events: Measurements for audio and video consumption in conjunction with our [SRG Media Player library](https://github.com/SRGSSR/SRGMediaPlayer-iOS).
+ * Hidden events: Custom events which can be used for measurement of application functionalities.
+ * Stream playback events: Measurements for audio and video consumption.
+
+The library can be used independently, but also seamlessly integrates with our [SRG Media Player](https://github.com/SRGSSR/SRGMediaPlayer-iOS) and [SRG Data Provider](https://github.com/SRGSSR/srgdataprovider-ios) libraries:
 
-Moreover, if you are retrieving your data using our [SRG Data Provider library](https://github.com/SRGSSR/srgdataprovider-ios), a bridge framework is also provided so that analytics received from the service are transparently forwarded to the SRG Analytics library.
+* When used in conjunction with the SRG Media Player library, media playback events are automatically tracked for media player controllers. Only basic measurement information is collected (type of the event, playback position, volume, etc.). Your application is responsible of providing other measurement information (e.g. title, duration, etc.), though.
+* When used in conjunction with the SRG Data Provider library as well, the additional SRG standard measurement information (title, duration, etc.) is automatically supplied, without any required work.
  
 ## Compatibility
 
@@ -20,7 +27,7 @@ The library is suitable for applications running on iOS 8 and above. The project
 
 ## Installation
 
-The library can be added to a project using [Carthage](https://github.com/Carthage/Carthage)  by adding the following dependency to your `Cartfile`:
+The library can be added to a project using [Carthage](https://github.com/Carthage/Carthage) by specifying the following dependency in your `Cartfile`:
     
 ```
 github "SRGSSR/srganalytics-ios"
@@ -34,14 +41,18 @@ Then run `carthage update --platform iOS` to update the dependencies. You will n
   * `MAKVONotificationCenter`: A safe KVO framework.
   * `SRGAnalytics`: The main analytics framework.
   * `SRGLogger`: The framework used for internal logging.
-* If you use our [SRG Media Player library](https://github.com/SRGSSR/SRGMediaPlayer-iOS) and want media consumption tracking as well, add the following frameworks to your project:
+  * `TCCore`: The core TagCommander framework.
+  * `TCSDK`: The main TagCommander SDK framework.
+* If you use our [SRG Media Player library](https://github.com/SRGSSR/SRGMediaPlayer-iOS) and want automatic media consumption tracking as well, add the following frameworks to your project:
   * `ComScore`: comScore framework.
   * `libextobjc`: A utility framework.
   * `MAKVONotificationCenter`: A safe KVO framework.
   * `SRGAnalytics`: The main analytics framework.
   * `SRGAnalytics_MediaPlayer`: The media player analytics companion framework.
   * `SRGLogger`: The framework used for internal logging.
-* If you use our [SRG Data Provider library](https://github.com/SRGSSR/srgdataprovider-ios) to retrieve data, add the following frameworks to your project:
+  * `TCCore`: The core TagCommander framework.
+  * `TCSDK`: The main TagCommander SDK framework.
+* If you use our [SRG Data Provider library](https://github.com/SRGSSR/srgdataprovider-ios) to retrieve and play medias, add the following frameworks to your project:
   * `ComScore`: comScore framework.
   * `libextobjc`: A utility framework.
   * `MAKVONotificationCenter`: A safe KVO framework.
@@ -51,6 +62,8 @@ Then run `carthage update --platform iOS` to update the dependencies. You will n
   * `SRGAnalytics_MediaPlayer`: The media player analytics companion framework.
   * `SRGLogger`: The framework used for internal logging.
   * `SRGMediaPlayer`: The media player framework (if not already in your project).
+  * `TCCore`: The core TagCommander framework.
+  * `TCSDK`: The main TagCommander SDK framework.
   
 For more information about Carthage and its use, refer to the [official documentation](https://github.com/Carthage/Carthage).
 
@@ -99,7 +112,7 @@ If URL schemes declared by your application do not match the current ones, appli
 
 #### Remark
 
-The number of URL schemes an application declares is limited to 50. Please contact us if you happen to reach this limit.
+The number of URL schemes an application declares is limited to 50. Please contact us if your application reaches this limit.
 
 ### Working with the library
 
@@ -119,9 +132,9 @@ This logger either automatically integrates with your own logger, or can be easi
 
 To test what the library is capable of, run the associated demo.
 
-## Migration from versions 1.x
+## Migration from previous major versions
 
-For information about changes introduced with version 2 of the library, please read the [migration guide](Documentation/Migration-guide.md).
+For information about migration from older major library versions, please read the [migration guide](Documentation/Migration-guide.md).
 
 ## License
 
diff --git a/SRGAnalytics.xcodeproj/project.pbxproj b/SRGAnalytics.xcodeproj/project.pbxproj
index f7594548..a0a86932 100644
--- a/SRGAnalytics.xcodeproj/project.pbxproj
+++ b/SRGAnalytics.xcodeproj/project.pbxproj
@@ -10,13 +10,27 @@
 		0811A8531D800BA000A9863B /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0811A8521D800BA000A9863B /* libextobjc.framework */; };
 		0811A8541D800BBC00A9863B /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0811A8521D800BA000A9863B /* libextobjc.framework */; };
 		0811A8551D800BBC00A9863B /* libextobjc.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0811A8521D800BA000A9863B /* libextobjc.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		083EE17C1F2B8B2700413A68 /* ComScoreDataProviderTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 083EE17A1F2B86B600413A68 /* ComScoreDataProviderTestCase.m */; };
+		08539C271F306E390033D406 /* ComScoreTrackerTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 08539C251F306CAF0033D406 /* ComScoreTrackerTestCase.m */; };
 		088700D51DA2540F00D4961A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 088700AF1DA2525800D4961A /* LaunchScreen.xib */; };
 		088700D71DA2542700D4961A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 088700B51DA2528900D4961A /* AppDelegate.m */; };
 		088700D81DA2542700D4961A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 088700B61DA2528900D4961A /* main.m */; };
 		088700D91DA2542D00D4961A /* DemosViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 088700B91DA2528900D4961A /* DemosViewController.m */; };
 		088700DF1DA2543800D4961A /* SimpleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 088700C51DA2528900D4961A /* SimpleViewController.m */; };
 		08A38EB81DA2971300908946 /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */; };
+		08EB669D1F3352AB00E9D7CA /* ComScoreViewEventTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 08EB669B1F3352A300E9D7CA /* ComScoreViewEventTests.m */; };
+		6F04985F1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F04985A1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6F0498601F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F04985B1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */; };
+		6F0498611F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F04985C1F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h */; };
+		6F0498621F343C7A00E88BEC /* SRGMediaPlayerTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F04985D1F343C7A00E88BEC /* SRGMediaPlayerTracker.h */; };
+		6F0498631F343C7A00E88BEC /* SRGMediaPlayerTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F04985E1F343C7A00E88BEC /* SRGMediaPlayerTracker.m */; };
+		6F4ED9B31F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F4ED9AF1F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6F4ED9B41F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F4ED9B01F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.m */; };
+		6F4ED9B51F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F4ED9B11F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6F4ED9B61F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F4ED9B21F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.m */; };
 		6F788E141E9BA56500D22495 /* KIF.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6F69505A1E9BA32B008FE8FA /* KIF.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		6F8F25961F0BD797009B116E /* TCCore.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		6F8F25971F0BD797009B116E /* TCSDK.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6FA09D891D9EC4BC00EDCA64 /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */; };
 		6FA09D8A1D9EC4CF00EDCA64 /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */; };
 		6FA09D8B1D9EC4DB00EDCA64 /* SRGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */; };
@@ -27,8 +41,9 @@
 		6FABE2EE1D9C0255001C4E9A /* SRGAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E69A1FF31D61E2070064E6C1 /* SRGAnalytics.framework */; };
 		6FABE2EF1D9C0258001C4E9A /* SRGAnalytics_MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E61C0D551D61E9CD00AEAE6D /* SRGAnalytics_MediaPlayer.framework */; };
 		6FABE2F01D9C0268001C4E9A /* SRGMediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E61C0D841D61F14A00AEAE6D /* SRGMediaPlayer.framework */; };
-		6FABE2FD1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FABE2FB1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6FABE2FE1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FABE2FC1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.m */; };
+		6FAE25F21F34D87600874A53 /* SRGAnalyticsConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FAE25F01F34D87600874A53 /* SRGAnalyticsConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6FAE25F31F34D87600874A53 /* SRGAnalyticsConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAE25F11F34D87600874A53 /* SRGAnalyticsConfiguration.m */; };
+		6FAE25F81F364E8B00874A53 /* ConfigurationTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAE25F71F364E8B00874A53 /* ConfigurationTestCase.m */; };
 		6FAF430B1EF7F5090074E033 /* NSString_AnalyticsTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAF430A1EF7F5090074E033 /* NSString_AnalyticsTestCase.m */; };
 		6FB331ED1D9BFB00001469F2 /* SRGAnalytics_DataProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FB331E61D9BFB00001469F2 /* SRGAnalytics_DataProvider.framework */; };
 		6FB331EE1D9BFB00001469F2 /* SRGAnalytics_DataProvider.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6FB331E61D9BFB00001469F2 /* SRGAnalytics_DataProvider.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -42,6 +57,21 @@
 		6FB97FEB1E4AF1870014C4C2 /* MAKVONotificationCenter.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6FB97FE31E4AF0270014C4C2 /* MAKVONotificationCenter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6FB97FEF1E4B005B0014C4C2 /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB97FEE1E4B005B0014C4C2 /* PlayerViewController.m */; };
 		6FB97FF11E4B00690014C4C2 /* PlayerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6FB97FF01E4B00690014C4C2 /* PlayerViewController.storyboard */; };
+		6FD86FF51F2B1E34001ED20F /* ComScoreMediaPlayerTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FD86FF41F2B1E34001ED20F /* ComScoreMediaPlayerTestCase.m */; };
+		6FD86FFA1F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FD86FF81F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6FD86FFB1F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FD86FF91F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.m */; };
+		6FD86FFE1F2B2CA9001ED20F /* SRGAnalyticsTracker+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FD86FFD1F2B2CA9001ED20F /* SRGAnalyticsTracker+Private.h */; };
+		6FD9B2461F0BC4E0004805D2 /* TCCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; };
+		6FD9B2471F0BC4E0004805D2 /* TCSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; };
+		6FD9B2481F0BC4FA004805D2 /* TCCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; };
+		6FD9B2491F0BC4FA004805D2 /* TCSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; };
+		6FD9B24A1F0BC50C004805D2 /* TCCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; };
+		6FD9B24B1F0BC50C004805D2 /* TCSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; };
+		6FD9B24C1F0BC513004805D2 /* TCCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; };
+		6FD9B24D1F0BC513004805D2 /* TCCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2441F0BC4E0004805D2 /* TCCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		6FD9B24E1F0BC513004805D2 /* TCSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; };
+		6FD9B24F1F0BC513004805D2 /* TCSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		6FD9B2501F0BC551004805D2 /* libextobjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0811A8521D800BA000A9863B /* libextobjc.framework */; };
 		6FF3E20F1D9CE68600EB4A30 /* Mantle.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6FF3E20E1D9CE68600EB4A30 /* Mantle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6FF3E2111D9CE6CF00EB4A30 /* SRGDataProvider.framework in Copy Frameworks Into Test Bundle */ = {isa = PBXBuildFile; fileRef = 6FF3E2101D9CE6CF00EB4A30 /* SRGDataProvider.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		6FF3E2161D9CF57600EB4A30 /* SRGDataProvider.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FF3E2101D9CE6CF00EB4A30 /* SRGDataProvider.framework */; };
@@ -65,8 +95,8 @@
 		E61388AA1D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E61388971D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.m */; };
 		E61388AB1D916A9900218919 /* NSBundle+SRGAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = E61388981D916A9900218919 /* NSBundle+SRGAnalytics.h */; };
 		E61388AC1D916A9900218919 /* NSBundle+SRGAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E61388991D916A9900218919 /* NSBundle+SRGAnalytics.m */; };
-		E61388AD1D916A9900218919 /* NSDictionary+SRGAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = E613889A1D916A9900218919 /* NSDictionary+SRGAnalytics.h */; };
-		E61388AE1D916A9900218919 /* NSDictionary+SRGAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E613889B1D916A9900218919 /* NSDictionary+SRGAnalytics.m */; };
+		E61388AD1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = E613889A1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.h */; };
+		E61388AE1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E613889B1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.m */; };
 		E61388AF1D916A9900218919 /* NSString+SRGAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = E613889C1D916A9900218919 /* NSString+SRGAnalytics.h */; };
 		E61388B01D916A9900218919 /* NSString+SRGAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = E613889D1D916A9900218919 /* NSString+SRGAnalytics.m */; };
 		E61388B41D91841600218919 /* SRGAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E69A1FF31D61E2070064E6C1 /* SRGAnalytics.framework */; };
@@ -94,10 +124,6 @@
 		E672EA511D62F19E00CFB080 /* ComScore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E672EA461D62EE5D00CFB080 /* ComScore.framework */; };
 		E672EA521D62F19E00CFB080 /* ComScore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E672EA461D62EE5D00CFB080 /* ComScore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E69A20621D61E5E80064E6C1 /* SRGAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = E69A20481D61E5E80064E6C1 /* SRGAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E6B8E9FE1D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E6B8E9F61D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E6B8E9FF1D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = E6B8E9F71D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */; };
-		E6B8EA001D92868D000D6904 /* SRGMediaPlayerTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = E6B8E9F81D92868D000D6904 /* SRGMediaPlayerTracker.h */; };
-		E6B8EA011D92868D000D6904 /* SRGMediaPlayerTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = E6B8E9F91D92868D000D6904 /* SRGMediaPlayerTracker.m */; };
 		E6B8EA041D92868D000D6904 /* SRGAnalyticsSegment.h in Headers */ = {isa = PBXBuildFile; fileRef = E6B8E9FD1D92868D000D6904 /* SRGAnalyticsSegment.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E6D609291DA7762600FA44EB /* AnalyticsTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = E6D609281DA7762600FA44EB /* AnalyticsTestCase.m */; };
 		E6FC7EA01D61F97500A55085 /* SRGAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E69A1FF31D61E2070064E6C1 /* SRGAnalytics.framework */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -167,6 +193,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				6F8F25961F0BD797009B116E /* TCCore.framework in Copy Frameworks Into Test Bundle */,
+				6F8F25971F0BD797009B116E /* TCSDK.framework in Copy Frameworks Into Test Bundle */,
 				6FB97FEB1E4AF1870014C4C2 /* MAKVONotificationCenter.framework in Copy Frameworks Into Test Bundle */,
 				6FA09D901D9EC53900EDCA64 /* SRGLogger.framework in Copy Frameworks Into Test Bundle */,
 				6FF3E2111D9CE6CF00EB4A30 /* SRGDataProvider.framework in Copy Frameworks Into Test Bundle */,
@@ -192,6 +220,8 @@
 				6FF3E2191D9CF58C00EB4A30 /* Mantle.framework in Embed Frameworks */,
 				0811A8551D800BBC00A9863B /* libextobjc.framework in Embed Frameworks */,
 				6FA09D8E1D9EC50B00EDCA64 /* SRGLogger.framework in Embed Frameworks */,
+				6FD9B24F1F0BC513004805D2 /* TCSDK.framework in Embed Frameworks */,
+				6FD9B24D1F0BC513004805D2 /* TCCore.framework in Embed Frameworks */,
 				6FF3E2171D9CF57600EB4A30 /* SRGDataProvider.framework in Embed Frameworks */,
 				6FB97FE81E4AF0D60014C4C2 /* MAKVONotificationCenter.framework in Embed Frameworks */,
 			);
@@ -202,6 +232,8 @@
 
 /* Begin PBXFileReference section */
 		0811A8521D800BA000A9863B /* libextobjc.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libextobjc.framework; path = Carthage/Build/iOS/libextobjc.framework; sourceTree = "<group>"; };
+		083EE17A1F2B86B600413A68 /* ComScoreDataProviderTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComScoreDataProviderTestCase.m; sourceTree = "<group>"; };
+		08539C251F306CAF0033D406 /* ComScoreTrackerTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComScoreTrackerTestCase.m; sourceTree = "<group>"; };
 		088700AF1DA2525800D4961A /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		088700B41DA2528900D4961A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		088700B51DA2528900D4961A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -210,12 +242,22 @@
 		088700B91DA2528900D4961A /* DemosViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemosViewController.m; sourceTree = "<group>"; };
 		088700C41DA2528900D4961A /* SimpleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleViewController.h; sourceTree = "<group>"; };
 		088700C51DA2528900D4961A /* SimpleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleViewController.m; sourceTree = "<group>"; };
+		08EB669B1F3352A300E9D7CA /* ComScoreViewEventTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComScoreViewEventTests.m; sourceTree = "<group>"; };
+		6F04985A1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h"; sourceTree = "<group>"; };
+		6F04985B1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m"; sourceTree = "<group>"; };
+		6F04985C1F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsMediaPlayerLogger.h; sourceTree = "<group>"; };
+		6F04985D1F343C7A00E88BEC /* SRGMediaPlayerTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGMediaPlayerTracker.h; sourceTree = "<group>"; };
+		6F04985E1F343C7A00E88BEC /* SRGMediaPlayerTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRGMediaPlayerTracker.m; sourceTree = "<group>"; };
+		6F4ED9AF1F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGSegment+SRGAnalytics_DataProvider.h"; sourceTree = "<group>"; };
+		6F4ED9B01F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGSegment+SRGAnalytics_DataProvider.m"; sourceTree = "<group>"; };
+		6F4ED9B11F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGSubdivision+SRGAnalytics_DataProvider.h"; sourceTree = "<group>"; };
+		6F4ED9B21F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGSubdivision+SRGAnalytics_DataProvider.m"; sourceTree = "<group>"; };
 		6F69505A1E9BA32B008FE8FA /* KIF.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KIF.framework; path = Carthage/Build/iOS/KIF.framework; sourceTree = "<group>"; };
 		6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SRGLogger.framework; path = Carthage/Build/iOS/SRGLogger.framework; sourceTree = "<group>"; };
-		6FA09D911D9EC61400EDCA64 /* SRGAnalyticsMediaPlayerLogger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsMediaPlayerLogger.h; sourceTree = "<group>"; };
 		6FA09D921D9EC66D00EDCA64 /* SRGAnalyticsDataProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsDataProvider.h; sourceTree = "<group>"; };
-		6FABE2FB1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGSubdivision+SRGAnalytics_DataProvider.h"; sourceTree = "<group>"; };
-		6FABE2FC1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGSubdivision+SRGAnalytics_DataProvider.m"; sourceTree = "<group>"; };
+		6FAE25F01F34D87600874A53 /* SRGAnalyticsConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsConfiguration.h; sourceTree = "<group>"; };
+		6FAE25F11F34D87600874A53 /* SRGAnalyticsConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRGAnalyticsConfiguration.m; sourceTree = "<group>"; };
+		6FAE25F71F364E8B00874A53 /* ConfigurationTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConfigurationTestCase.m; sourceTree = "<group>"; };
 		6FAF430A1EF7F5090074E033 /* NSString_AnalyticsTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSString_AnalyticsTestCase.m; path = Tests/Sources/NSString_AnalyticsTestCase.m; sourceTree = SOURCE_ROOT; };
 		6FB331E61D9BFB00001469F2 /* SRGAnalytics_DataProvider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SRGAnalytics_DataProvider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6FB331F51D9BFB77001469F2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -224,6 +266,12 @@
 		6FB97FED1E4B005B0014C4C2 /* PlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerViewController.h; sourceTree = "<group>"; };
 		6FB97FEE1E4B005B0014C4C2 /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
 		6FB97FF01E4B00690014C4C2 /* PlayerViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = PlayerViewController.storyboard; sourceTree = "<group>"; };
+		6FD86FF41F2B1E34001ED20F /* ComScoreMediaPlayerTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComScoreMediaPlayerTestCase.m; path = Tests/Sources/ComScoreMediaPlayerTestCase.m; sourceTree = SOURCE_ROOT; };
+		6FD86FF81F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsStreamTracker.h; sourceTree = "<group>"; };
+		6FD86FF91F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRGAnalyticsStreamTracker.m; sourceTree = "<group>"; };
+		6FD86FFD1F2B2CA9001ED20F /* SRGAnalyticsTracker+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGAnalyticsTracker+Private.h"; sourceTree = "<group>"; };
+		6FD9B2441F0BC4E0004805D2 /* TCCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TCCore.framework; path = Carthage/Build/iOS/TCCore.framework; sourceTree = "<group>"; };
+		6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TCSDK.framework; path = Carthage/Build/iOS/TCSDK.framework; sourceTree = "<group>"; };
 		6FF3E20E1D9CE68600EB4A30 /* Mantle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mantle.framework; path = Carthage/Build/iOS/Mantle.framework; sourceTree = "<group>"; };
 		6FF3E2101D9CE6CF00EB4A30 /* SRGDataProvider.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SRGDataProvider.framework; path = Carthage/Build/iOS/SRGDataProvider.framework; sourceTree = "<group>"; };
 		6FF3E21A1D9CFD7D00EB4A30 /* SRGMediaPlayerController+SRGAnalytics_DataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGMediaPlayerController+SRGAnalytics_DataProvider.h"; sourceTree = "<group>"; };
@@ -246,8 +294,8 @@
 		E61388971D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CSMeasurementDispatcher+SRGAnalytics.m"; sourceTree = "<group>"; };
 		E61388981D916A9900218919 /* NSBundle+SRGAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+SRGAnalytics.h"; sourceTree = "<group>"; };
 		E61388991D916A9900218919 /* NSBundle+SRGAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+SRGAnalytics.m"; sourceTree = "<group>"; };
-		E613889A1D916A9900218919 /* NSDictionary+SRGAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+SRGAnalytics.h"; sourceTree = "<group>"; };
-		E613889B1D916A9900218919 /* NSDictionary+SRGAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+SRGAnalytics.m"; sourceTree = "<group>"; };
+		E613889A1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+SRGAnalytics.h"; sourceTree = "<group>"; };
+		E613889B1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+SRGAnalytics.m"; sourceTree = "<group>"; };
 		E613889C1D916A9900218919 /* NSString+SRGAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+SRGAnalytics.h"; sourceTree = "<group>"; };
 		E613889D1D916A9900218919 /* NSString+SRGAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+SRGAnalytics.m"; sourceTree = "<group>"; };
 		E61388B91D91903B00218919 /* SRGAnalyticsNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsNotifications.h; sourceTree = "<group>"; };
@@ -273,10 +321,6 @@
 		E69A1FF31D61E2070064E6C1 /* SRGAnalytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SRGAnalytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E69A202E1D61E5E80064E6C1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E69A20481D61E5E80064E6C1 /* SRGAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalytics.h; sourceTree = "<group>"; };
-		E6B8E9F61D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h"; sourceTree = "<group>"; };
-		E6B8E9F71D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m"; sourceTree = "<group>"; };
-		E6B8E9F81D92868D000D6904 /* SRGMediaPlayerTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGMediaPlayerTracker.h; sourceTree = "<group>"; };
-		E6B8E9F91D92868D000D6904 /* SRGMediaPlayerTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRGMediaPlayerTracker.m; sourceTree = "<group>"; };
 		E6B8E9FD1D92868D000D6904 /* SRGAnalyticsSegment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsSegment.h; sourceTree = "<group>"; };
 		E6D609271DA7762600FA44EB /* AnalyticsTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalyticsTestCase.h; sourceTree = "<group>"; };
 		E6D609281DA7762600FA44EB /* AnalyticsTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnalyticsTestCase.m; sourceTree = "<group>"; };
@@ -291,6 +335,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6FD9B24A1F0BC50C004805D2 /* TCCore.framework in Frameworks */,
+				6FD9B24B1F0BC50C004805D2 /* TCSDK.framework in Frameworks */,
 				6FB97FE61E4AF0CD0014C4C2 /* MAKVONotificationCenter.framework in Frameworks */,
 				E66BEC171DA7FA5900AD4450 /* libextobjc.framework in Frameworks */,
 				6FA09D8B1D9EC4DB00EDCA64 /* SRGLogger.framework in Frameworks */,
@@ -304,6 +350,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6FD9B2481F0BC4FA004805D2 /* TCCore.framework in Frameworks */,
+				6FD9B2491F0BC4FA004805D2 /* TCSDK.framework in Frameworks */,
 				6FB97FE51E4AF0B50014C4C2 /* MAKVONotificationCenter.framework in Frameworks */,
 				6FA09D8A1D9EC4CF00EDCA64 /* SRGLogger.framework in Frameworks */,
 				0811A8531D800BA000A9863B /* libextobjc.framework in Frameworks */,
@@ -316,6 +364,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6FD9B2501F0BC551004805D2 /* libextobjc.framework in Frameworks */,
 				6FB97FEA1E4AF1800014C4C2 /* MAKVONotificationCenter.framework in Frameworks */,
 				6FA09D8F1D9EC52900EDCA64 /* SRGLogger.framework in Frameworks */,
 				6FF3E22C1D9D330700EB4A30 /* SRGAnalytics_DataProvider.framework in Frameworks */,
@@ -339,6 +388,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6FD9B2461F0BC4E0004805D2 /* TCCore.framework in Frameworks */,
+				6FD9B2471F0BC4E0004805D2 /* TCSDK.framework in Frameworks */,
 				6FB97FE41E4AF0270014C4C2 /* MAKVONotificationCenter.framework in Frameworks */,
 				E66BEC161DA7FA4800AD4450 /* libextobjc.framework in Frameworks */,
 				6FA09D891D9EC4BC00EDCA64 /* SRGLogger.framework in Frameworks */,
@@ -358,6 +409,8 @@
 				0811A8541D800BBC00A9863B /* libextobjc.framework in Frameworks */,
 				E672EA511D62F19E00CFB080 /* ComScore.framework in Frameworks */,
 				6FF3E2181D9CF58C00EB4A30 /* Mantle.framework in Frameworks */,
+				6FD9B24E1F0BC513004805D2 /* TCSDK.framework in Frameworks */,
+				6FD9B24C1F0BC513004805D2 /* TCCore.framework in Frameworks */,
 				E6FC7EA51D61F97800A55085 /* SRGAnalytics_MediaPlayer.framework in Frameworks */,
 				E6FC7EA01D61F97500A55085 /* SRGAnalytics.framework in Frameworks */,
 			);
@@ -396,6 +449,15 @@
 			path = Simple;
 			sourceTree = "<group>";
 		};
+		6F0498591F343C7A00E88BEC /* Categories */ = {
+			isa = PBXGroup;
+			children = (
+				6F04985A1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */,
+				6F04985B1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */,
+			);
+			path = Categories;
+			sourceTree = "<group>";
+		};
 		6FB331F41D9BFB77001469F2 /* Framework_DataProvider */ = {
 			isa = PBXGroup;
 			children = (
@@ -410,10 +472,12 @@
 			isa = PBXGroup;
 			children = (
 				6FA09D921D9EC66D00EDCA64 /* SRGAnalyticsDataProvider.h */,
+				6F4ED9AF1F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.h */,
+				6F4ED9B01F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.m */,
 				6FF3E21A1D9CFD7D00EB4A30 /* SRGMediaPlayerController+SRGAnalytics_DataProvider.h */,
 				6FF3E21B1D9CFD7D00EB4A30 /* SRGMediaPlayerController+SRGAnalytics_DataProvider.m */,
-				6FABE2FB1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.h */,
-				6FABE2FC1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.m */,
+				6F4ED9B11F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.h */,
+				6F4ED9B21F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.m */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -469,6 +533,8 @@
 				6FA09D881D9EC4BC00EDCA64 /* SRGLogger.framework */,
 				E61C0D841D61F14A00AEAE6D /* SRGMediaPlayer.framework */,
 				9FD74D421ACC2DF900A2D86A /* SystemConfiguration.framework */,
+				6FD9B2441F0BC4E0004805D2 /* TCCore.framework */,
+				6FD9B2451F0BC4E0004805D2 /* TCSDK.framework */,
 				9F1519211AC422AE00AE051D /* UIKit.framework */,
 			);
 			name = Frameworks;
@@ -477,15 +543,20 @@
 		E61388891D916A9900218919 /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				6FAE25F01F34D87600874A53 /* SRGAnalyticsConfiguration.h */,
+				6FAE25F11F34D87600874A53 /* SRGAnalyticsConfiguration.m */,
 				E613888A1D916A9900218919 /* SRGAnalyticsLogger.h */,
 				E613888C1D916A9900218919 /* SRGAnalyticsNetMetrixTracker.h */,
 				E613888D1D916A9900218919 /* SRGAnalyticsNetMetrixTracker.m */,
+				E61388B91D91903B00218919 /* SRGAnalyticsNotifications.h */,
+				E61388BA1D91903B00218919 /* SRGAnalyticsNotifications.m */,
+				6FD86FF81F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.h */,
+				6FD86FF91F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.m */,
 				E61388911D916A9900218919 /* SRGAnalyticsTracker.h */,
 				E61388921D916A9900218919 /* SRGAnalyticsTracker.m */,
+				6FD86FFD1F2B2CA9001ED20F /* SRGAnalyticsTracker+Private.h */,
 				E61388931D916A9900218919 /* UIViewController+SRGAnalytics.h */,
 				E61388941D916A9900218919 /* UIViewController+SRGAnalytics.m */,
-				E61388B91D91903B00218919 /* SRGAnalyticsNotifications.h */,
-				E61388BA1D91903B00218919 /* SRGAnalyticsNotifications.m */,
 			);
 			path = Core;
 			sourceTree = "<group>";
@@ -497,8 +568,8 @@
 				E61388971D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.m */,
 				E61388981D916A9900218919 /* NSBundle+SRGAnalytics.h */,
 				E61388991D916A9900218919 /* NSBundle+SRGAnalytics.m */,
-				E613889A1D916A9900218919 /* NSDictionary+SRGAnalytics.h */,
-				E613889B1D916A9900218919 /* NSDictionary+SRGAnalytics.m */,
+				E613889A1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.h */,
+				E613889B1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.m */,
 				E613889C1D916A9900218919 /* NSString+SRGAnalytics.h */,
 				E613889D1D916A9900218919 /* NSString+SRGAnalytics.m */,
 			);
@@ -518,8 +589,11 @@
 		E61C0D601D61EFD200AEAE6D /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				E6B8E9F51D92868D000D6904 /* MediaPlayer */,
+				6F0498591F343C7A00E88BEC /* Categories */,
 				E6B8E9FC1D92868D000D6904 /* Protocols */,
+				6F04985C1F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h */,
+				6F04985D1F343C7A00E88BEC /* SRGMediaPlayerTracker.h */,
+				6F04985E1F343C7A00E88BEC /* SRGMediaPlayerTracker.m */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -536,8 +610,12 @@
 		E65490AE1D803C3E007D96E7 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				E65490CD1D816A18007D96E7 /* Helpers */,
+				08539C251F306CAF0033D406 /* ComScoreTrackerTestCase.m */,
+				083EE17A1F2B86B600413A68 /* ComScoreDataProviderTestCase.m */,
+				6FD86FF41F2B1E34001ED20F /* ComScoreMediaPlayerTestCase.m */,
+				6FAE25F71F364E8B00874A53 /* ConfigurationTestCase.m */,
 				6FF3E22A1D9D2E9B00EB4A30 /* DataProviderTestCase.m */,
+				E65490CD1D816A18007D96E7 /* Helpers */,
 				E65490B11D803CA2007D96E7 /* MediaPlayerTestCase.m */,
 				E600FE5C1D93C5ED000B8A1D /* TrackerTestCase.m */,
 			);
@@ -563,6 +641,7 @@
 		E66F8A701D62DC570004EB58 /* DemoTests */ = {
 			isa = PBXGroup;
 			children = (
+				08EB669B1F3352A300E9D7CA /* ComScoreViewEventTests.m */,
 				E66F8A711D62DC570004EB58 /* Info.plist */,
 				E66F8A721D62DC570004EB58 /* ViewEventTests.m */,
 			);
@@ -589,18 +668,6 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		E6B8E9F51D92868D000D6904 /* MediaPlayer */ = {
-			isa = PBXGroup;
-			children = (
-				6FA09D911D9EC61400EDCA64 /* SRGAnalyticsMediaPlayerLogger.h */,
-				E6B8E9F61D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */,
-				E6B8E9F71D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */,
-				E6B8E9F81D92868D000D6904 /* SRGMediaPlayerTracker.h */,
-				E6B8E9F91D92868D000D6904 /* SRGMediaPlayerTracker.m */,
-			);
-			path = MediaPlayer;
-			sourceTree = "<group>";
-		};
 		E6B8E9FC1D92868D000D6904 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
@@ -646,8 +713,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6FABE2FD1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.h in Headers */,
+				6F4ED9B31F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.h in Headers */,
 				6FF3E21C1D9CFD7D00EB4A30 /* SRGMediaPlayerController+SRGAnalytics_DataProvider.h in Headers */,
+				6F4ED9B51F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.h in Headers */,
 				6FB331F91D9BFB77001469F2 /* SRGAnalytics_DataProvider.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -656,10 +724,11 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6F04985F1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h in Headers */,
 				E61C0D751D61EFD200AEAE6D /* SRGAnalytics_MediaPlayer.h in Headers */,
-				E6B8E9FE1D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h in Headers */,
-				E6B8EA001D92868D000D6904 /* SRGMediaPlayerTracker.h in Headers */,
+				6F0498611F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h in Headers */,
 				E6B8EA041D92868D000D6904 /* SRGAnalyticsSegment.h in Headers */,
+				6F0498621F343C7A00E88BEC /* SRGMediaPlayerTracker.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -672,11 +741,14 @@
 				E613889E1D916A9900218919 /* SRGAnalyticsLogger.h in Headers */,
 				E61388A91D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.h in Headers */,
 				E61388AB1D916A9900218919 /* NSBundle+SRGAnalytics.h in Headers */,
+				6FAE25F21F34D87600874A53 /* SRGAnalyticsConfiguration.h in Headers */,
 				E61388A51D916A9900218919 /* SRGAnalyticsTracker.h in Headers */,
 				E61388BB1D91903B00218919 /* SRGAnalyticsNotifications.h in Headers */,
 				E61388AF1D916A9900218919 /* NSString+SRGAnalytics.h in Headers */,
 				E61388A01D916A9900218919 /* SRGAnalyticsNetMetrixTracker.h in Headers */,
-				E61388AD1D916A9900218919 /* NSDictionary+SRGAnalytics.h in Headers */,
+				6FD86FFE1F2B2CA9001ED20F /* SRGAnalyticsTracker+Private.h in Headers */,
+				E61388AD1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.h in Headers */,
+				6FD86FFA1F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -906,8 +978,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6FABE2FE1D9C175E001C4E9A /* SRGSubdivision+SRGAnalytics_DataProvider.m in Sources */,
 				6FF3E21D1D9CFD7D00EB4A30 /* SRGMediaPlayerController+SRGAnalytics_DataProvider.m in Sources */,
+				6F4ED9B41F38A50200E3EA51 /* SRGSegment+SRGAnalytics_DataProvider.m in Sources */,
+				6F4ED9B61F38A50200E3EA51 /* SRGSubdivision+SRGAnalytics_DataProvider.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -915,8 +988,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6B8E9FF1D92868D000D6904 /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m in Sources */,
-				E6B8EA011D92868D000D6904 /* SRGMediaPlayerTracker.m in Sources */,
+				6F0498601F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m in Sources */,
+				6F0498631F343C7A00E88BEC /* SRGMediaPlayerTracker.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -926,8 +999,12 @@
 			files = (
 				E65490D51D816A18007D96E7 /* NSNotificationCenter+Tests.m in Sources */,
 				E600FE5D1D93C5ED000B8A1D /* TrackerTestCase.m in Sources */,
+				083EE17C1F2B8B2700413A68 /* ComScoreDataProviderTestCase.m in Sources */,
+				08539C271F306E390033D406 /* ComScoreTrackerTestCase.m in Sources */,
 				E6D609291DA7762600FA44EB /* AnalyticsTestCase.m in Sources */,
 				6FF3E22B1D9D2E9B00EB4A30 /* DataProviderTestCase.m in Sources */,
+				6FD86FF51F2B1E34001ED20F /* ComScoreMediaPlayerTestCase.m in Sources */,
+				6FAE25F81F364E8B00874A53 /* ConfigurationTestCase.m in Sources */,
 				E600FE7E1D943D96000B8A1D /* TrackerSingletonSetup.m in Sources */,
 				E65490B21D803CA2007D96E7 /* MediaPlayerTestCase.m in Sources */,
 				6FAF430B1EF7F5090074E033 /* NSString_AnalyticsTestCase.m in Sources */,
@@ -940,6 +1017,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				08EB669D1F3352AB00E9D7CA /* ComScoreViewEventTests.m in Sources */,
 				E66F8A761D62DC570004EB58 /* ViewEventTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -949,12 +1027,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				E61388AC1D916A9900218919 /* NSBundle+SRGAnalytics.m in Sources */,
-				E61388AE1D916A9900218919 /* NSDictionary+SRGAnalytics.m in Sources */,
+				E61388AE1D916A9900218919 /* NSMutableDictionary+SRGAnalytics.m in Sources */,
 				E61388AA1D916A9900218919 /* CSMeasurementDispatcher+SRGAnalytics.m in Sources */,
+				6FAE25F31F34D87600874A53 /* SRGAnalyticsConfiguration.m in Sources */,
 				E61388B01D916A9900218919 /* NSString+SRGAnalytics.m in Sources */,
 				E61388BC1D91903B00218919 /* SRGAnalyticsNotifications.m in Sources */,
 				E6FC7F9F1D620AE700A55085 /* SRGAnalytics.m in Sources */,
 				E61388A11D916A9900218919 /* SRGAnalyticsNetMetrixTracker.m in Sources */,
+				6FD86FFB1F2B2A7F001ED20F /* SRGAnalyticsStreamTracker.m in Sources */,
 				E61388A61D916A9900218919 /* SRGAnalyticsTracker.m in Sources */,
 				E61388A81D916A9900218919 /* UIViewController+SRGAnalytics.m in Sources */,
 			);
@@ -1099,7 +1179,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MARKETING_VERSION = 2.2.2;
+				MARKETING_VERSION = 3.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1146,7 +1226,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MARKETING_VERSION = 2.2.2;
+				MARKETING_VERSION = 3.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/Tests/Sources/ComScoreDataProviderTestCase.m b/Tests/Sources/ComScoreDataProviderTestCase.m
new file mode 100644
index 00000000..053ce662
--- /dev/null
+++ b/Tests/Sources/ComScoreDataProviderTestCase.m
@@ -0,0 +1,115 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "AnalyticsTestCase.h"
+
+#import <SRGAnalytics_DataProvider/SRGAnalytics_DataProvider.h>
+
+static NSURL *ServiceTestURL(void)
+{
+    return [NSURL URLWithString:@"http://il.srgssr.ch"];
+}
+
+@interface ComScoreDataProviderTestCase : AnalyticsTestCase
+
+@property (nonatomic) SRGMediaPlayerController *mediaPlayerController;
+
+@end
+
+@implementation ComScoreDataProviderTestCase
+
+#pragma mark Setup and teardown
+
+- (void)setUp
+{
+    self.mediaPlayerController = [[SRGMediaPlayerController alloc] init];
+    self.mediaPlayerController.liveTolerance = 10.;
+}
+
+- (void)tearDown
+{
+    [self.mediaPlayerController reset];
+    self.mediaPlayerController = nil;
+}
+
+#pragma mark Tests
+
+- (void)testPrepareToPlayMediaComposition
+{
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Ready to play"];
+    
+    SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL() businessUnitIdentifier:SRGDataProviderBusinessUnitIdentifierSWI];
+    [[dataProvider videoMediaCompositionWithUid:@"42297626" chaptersOnly:NO completionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSError * _Nullable error) {
+        XCTAssertNotNil(mediaComposition);
+        
+        [self.mediaPlayerController prepareToPlayMediaComposition:mediaComposition withPreferredStreamingMethod:SRGStreamingMethodNone quality:SRGQualityHD startBitRate:0 userInfo:nil resume:YES completionHandler:^(NSError * _Nonnull error) {
+            XCTAssertNil(error);
+            XCTAssertEqual(self.mediaPlayerController.mediaComposition, mediaComposition);
+            [expectation fulfill];
+        }];
+    }] resume];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePaused);
+    
+    // Start playback and check labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"ns_st_ep"], @"Archive footage of the man and his moods");
+        XCTAssertEqualObjects(labels[@"srg_mqual"], @"HD");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlayMediaComposition
+{
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Ready to play"];
+    
+    SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL() businessUnitIdentifier:SRGDataProviderBusinessUnitIdentifierSWI];
+    [[dataProvider videoMediaCompositionWithUid:@"42297626" chaptersOnly:NO completionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSError * _Nullable error) {
+        XCTAssertNotNil(mediaComposition);
+        
+        [self.mediaPlayerController playMediaComposition:mediaComposition withPreferredStreamingMethod:SRGStreamingMethodNone quality:SRGQualityHD startBitRate:0 userInfo:nil resume:YES completionHandler:^(NSError * _Nonnull error) {
+            XCTAssertNil(error);
+            XCTAssertEqual(self.mediaPlayerController.mediaComposition, mediaComposition);
+            [expectation fulfill];
+        }];
+    }] resume];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+}
+
+- (void)testPlaySegmentInMediaComposition
+{
+    // Use a segment id as video id, expect segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"ns_st_ep"], @"Schweizer Pioniere: Die Fitnessbloggerin in der Türkei");
+        XCTAssertEqualObjects(labels[@"srg_mqual"], @"HD");
+        return YES;
+    }];
+    
+    SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL() businessUnitIdentifier:SRGDataProviderBusinessUnitIdentifierSRF];
+    [[dataProvider videoMediaCompositionWithUid:@"27af89ad-2408-40e5-8318-96e25d3e003b" chaptersOnly:NO completionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSError * _Nullable error) {
+        XCTAssertNotNil(mediaComposition);
+        
+        [self.mediaPlayerController playMediaComposition:mediaComposition withPreferredStreamingMethod:SRGStreamingMethodNone quality:SRGQualityHD startBitRate:0 userInfo:nil resume:YES completionHandler:^(NSError * _Nonnull error) {
+            XCTAssertNil(error);
+            XCTAssertEqual(self.mediaPlayerController.mediaComposition, mediaComposition);
+        }];
+    }] resume];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+@end
diff --git a/Tests/Sources/ComScoreMediaPlayerTestCase.m b/Tests/Sources/ComScoreMediaPlayerTestCase.m
new file mode 100644
index 00000000..14501522
--- /dev/null
+++ b/Tests/Sources/ComScoreMediaPlayerTestCase.m
@@ -0,0 +1,1879 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "AnalyticsTestCase.h"
+#import "NSNotificationCenter+Tests.h"
+#import "Segment.h"
+
+#import <SRGAnalytics_MediaPlayer/SRGAnalytics_MediaPlayer.h>
+
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
+
+static NSURL *OnDemandTestURL(void)
+{
+    return [NSURL URLWithString:@"https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8"];
+}
+
+static NSURL *LiveTestURL(void)
+{
+    return [NSURL URLWithString:@"http://ndr_fs-lh.akamaihd.net/i/ndrfs_nds@119224/master.m3u8?dw=0"];
+}
+
+static NSURL *DVRTestURL(void)
+{
+    return [NSURL URLWithString:@"http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8"];
+}
+
+@interface ComScoreMediaPlayerTestCase : AnalyticsTestCase
+
+@property (nonatomic) SRGMediaPlayerController *mediaPlayerController;
+
+@end
+
+@implementation ComScoreMediaPlayerTestCase
+
+#pragma mark Setup and teardown
+
+- (void)setUp
+{
+    self.mediaPlayerController = [[SRGMediaPlayerController alloc] init];
+    self.mediaPlayerController.liveTolerance = 10.;
+}
+
+- (void)tearDown
+{
+    [self.mediaPlayerController reset];
+    self.mediaPlayerController = nil;
+}
+
+#pragma mark Tests
+
+- (void)testPrepareToPlay
+{
+    // Prepare the player until it is paused. No event must be received
+    id prepareObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when preparing a player");
+    }];
+    
+    [self.mediaPlayerController prepareToPlayURL:OnDemandTestURL() withCompletionHandler:^{
+        [[NSNotificationCenter defaultCenter] removeObserver:prepareObserver];
+    }];
+    
+    // Now playing must trigger a play event
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlaybackToEnd
+{
+    // Also check internal comScore important measurement values for playback duration (ns_st_pa and ns_st_pt). Ensure
+    // we did not mess with them by mistake
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        
+        // comScore internal duration labels
+        XCTAssertNil(labels[@"ns_st_pa"]);
+        XCTAssertNil(labels[@"ns_st_pt"]);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        
+        // comScore internal duration labels
+        XCTAssertNotNil(labels[@"ns_st_pa"]);
+        XCTAssertNotEqualObjects(labels[@"ns_st_pa"], @"0");
+        XCTAssertNotEqualObjects(labels[@"ns_st_pt"], @"0");
+        return YES;
+    }];
+    
+    // Seek near the end of the video
+    CMTime pastTime = CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), CMTimeMakeWithSeconds(5., NSEC_PER_SEC));
+    [self.mediaPlayerController seekPreciselyToTime:pastTime withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        
+        // comScore internal duration labels
+        XCTAssertNil(labels[@"ns_st_pa"]);
+        XCTAssertNil(labels[@"ns_st_pt"]);
+        return YES;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Let playback finish normally
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        
+        // comScore internal duration labels
+        XCTAssertNotNil(labels[@"ns_st_pa"]);
+        XCTAssertNotEqualObjects(labels[@"ns_st_pa"], @"0");
+        XCTAssertNotEqualObjects(labels[@"ns_st_pt"], @"0");
+        return YES;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlayStop
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController stop];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlayReset
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlayPausePlay
+{
+    __block NSInteger count1 = 0;
+    id eventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count1;
+    }];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver1];
+    }];
+    
+    // One event expected: play
+    XCTAssertEqual(count1, 1);
+    
+    __block NSInteger count2 = 0;
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count2;
+    }];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"pause"];
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver2];
+    }];
+    
+    // One event expected: pause
+    XCTAssertEqual(count2, 1);
+    
+    __block NSInteger count3 = 0;
+    id eventObserver3 = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count3;
+    }];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver3];
+    }];
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    id eventObserver4 = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
+        // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
+        NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
+              "captured via KVO in our implementation. Those changes do not harm but cannot be tested reliably", @(self.mediaPlayerController.playbackState));
+    }];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver4];
+    }];
+}
+
+- (void)testConsecutiveMedia
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:LiveTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testMediaError
+{
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackDidFailNotification object:self.mediaPlayerController handler:^BOOL (NSNotification *notification) {
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:[NSURL URLWithString:@"http://httpbin.org/status/403"]];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+}
+
+- (void)testCommonLabels
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        
+        XCTAssertEqualObjects(labels[@"ns_st_mp"], @"SRGMediaPlayer");
+        XCTAssertEqualObjects(labels[@"ns_st_mv"], SRGMediaPlayerMarketingVersion());
+        XCTAssertEqualObjects(labels[@"ns_st_it"], @"c");
+        XCTAssertEqualObjects(labels[@"srg_ptype"], @"p_app_ios");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testOnDemandLabels
+{
+    // Check that these labels are constant between states (for some, the value might differ, but they must
+    // in which case we test they are constantly availble or unavailable)
+    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
+        XCTAssertNotNil(labels[@"ns_st_br"]);
+        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
+        XCTAssertNotNil(labels[@"ns_st_vo"]);
+        XCTAssertNil(labels[@"ns_ap_ot"]);
+        
+        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
+        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
+    };
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertNil(labels[@"srg_timeshift"]);
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertNil(labels[@"srg_timeshift"]);
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertNil(labels[@"srg_timeshift"]);
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testLiveLabels
+{
+    // Check that these labels are constant between states (for some, the value might differ, but they must
+    // in which case we test they are constantly availble or unavailable)
+    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
+        XCTAssertNotNil(labels[@"ns_st_br"]);
+        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
+        XCTAssertNotNil(labels[@"ns_st_vo"]);
+        XCTAssertNil(labels[@"ns_ap_ot"]);
+        
+        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
+        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
+    };
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"test_info" : @"test" };
+    
+    [self.mediaPlayerController playURL:LiveTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:nil
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDVRLabels
+{
+    // Check that these labels are constant between states (for some, the value might differ, but they must
+    // in which case we test they are constantly availble or unavailable)
+    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
+        XCTAssertNotNil(labels[@"ns_st_br"]);
+        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
+        XCTAssertNotNil(labels[@"ns_st_vo"]);
+        XCTAssertNil(labels[@"ns_ap_ot"]);
+        
+        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
+        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
+    };
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:DVRTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    CMTime pastTime = CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), CMTimeMakeWithSeconds(45., NSEC_PER_SEC));
+    [self.mediaPlayerController seekPreciselyToTime:pastTime withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertNotNil(labels[@"srg_timeshift"]);
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"45000");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"45000");
+        checkMainLabels(labels);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testVolumeLabel
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"ns_st_vo"], @"0");
+        return YES;
+    }];
+    
+    self.mediaPlayerController.playerCreationBlock = ^(AVPlayer *player) {
+        player.muted = YES;
+    };
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertNotEqualObjects(labels[@"ns_st_vo"], @"0");
+        return YES;
+    }];
+    
+    self.mediaPlayerController.player.muted = NO;
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testNonSelectedSegmentPlayback
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Let the segment be played through. No events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received");
+    }];
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Pause playback. Expect full-length information
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Resume playback. Expect full-length information
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
+        // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
+        NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
+              "captured via KVO in our implementation. Those changes do not harm but cannot be tested reliably", @(self.mediaPlayerController.playbackState));
+    }];
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver2];
+    }];
+}
+
+- (void)testSelectedSegmentPlayback
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Pause playback. Expect segment information
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Resume playback. Expect segment information
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testInitialSegmentSelectionAndPlaythrough
+{
+    // No end on full since we start with the segment, only a play for the segment
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Let the segment be played through until we receive the transition notifications (since both are the same, capture
+    // them with a single expectation)
+    
+    __block BOOL segmentEndReceived = NO;
+    __block BOOL fullPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(segmentEndReceived);
+            XCTAssertFalse(fullPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentEndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segmentEndReceived && fullPlayReceived;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSegmentSelectionAfterStartOnFullLength
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // When selecting a segment, usual playback events due to seeking must be inhibited
+    
+    __block BOOL fullEndReceived = NO;
+    __block BOOL segmentPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(fullEndReceived);
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullEndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullEndReceived && segmentPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekToSegment:segment withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSegmentSelectionWhilePlayingSelectedSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        return YES;
+    }];
+    
+    Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(100., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect segment transition (but no playback events) when selecting another segment
+    
+    __block BOOL segment1EndReceived = NO;
+    __block BOOL segment2PlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(segment1EndReceived);
+            XCTAssertFalse(segment2PlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            segment1EndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(segment2PlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment2");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment2");
+            segment2PlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segment1EndReceived && segment2PlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekToSegment:segment2 withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testTransitionFromSelectedSegmentIntoNonSelectedContiguousSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        return YES;
+    }];
+    
+    Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(20., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(23., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Let the segment be played through. A transition into the full-length is expected since the second segment
+    // is not selected
+    
+    __block BOOL segment1EndReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(segment1EndReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            segment1EndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segment1EndReceived && fullLengthPlayReceived;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSegmentRepeatedSelection
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect segment transition (but no playback events) when selecting another segment
+    
+    __block BOOL segmentEndReceived = NO;
+    __block BOOL segmentPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(segmentEndReceived);
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentEndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segmentEndReceived && segmentPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekToSegment:segment withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSeekOutsideSelectedSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        return YES;
+    }];
+    
+    Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(60., NSEC_PER_SEC), CMTimeMakeWithSeconds(20., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect transition into the full-length since, even if seeking resumes in another segment (since this segment has
+    // not been selected, we don't want to track it). Because of a seek, a pause in the segment is expected first
+    
+    __block BOOL segment1PauseReceived = NO;
+    __block BOOL segment1EndReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(segment1PauseReceived);
+            XCTAssertFalse(segment1EndReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            segment1PauseReceived = YES;
+        }
+        else if ([event isEqualToString:@"end"]) {
+            XCTAssertFalse(segment1EndReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            segment1EndReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        
+        return segment1PauseReceived && segment1EndReceived && fullLengthPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeAdd(CMTimeRangeGetEnd(segment1.srg_timeRange), CMTimeMakeWithSeconds(10., NSEC_PER_SEC)) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSeekWithinSelectedSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect play - pause transition with segment labels
+    
+    __block BOOL segmentPauseReceived = NO;
+    __block BOOL segmentPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(segmentPauseReceived);
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentPauseReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(segmentPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            segmentPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segmentPauseReceived && segmentPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeAdd(segment.srg_timeRange.start, CMTimeMakeWithSeconds(3., NSEC_PER_SEC)) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSelectedSegmentAtStreamEnd
+{
+    // Precise timing information gathered from the stream itself
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(1795.045, NSEC_PER_SEC), CMTimeMakeWithSeconds(5., NSEC_PER_SEC))];
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    XCTAssertEqualObjects(self.mediaPlayerController.currentSegment, segment);
+    XCTAssertEqualObjects(self.mediaPlayerController.selectedSegment, segment);
+    
+    // Expect end of segment and play / end for the full-length (which does not harm for statistics)
+    
+    __block BOOL segmentEndReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    __block BOOL fullLengthEndReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"end"]) {
+            if (! segmentEndReceived) {
+                XCTAssertFalse(fullLengthPlayReceived);
+                XCTAssertFalse(fullLengthEndReceived);
+                
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+                segmentEndReceived = YES;
+            }
+            else {
+                XCTAssertFalse(fullLengthEndReceived);
+                
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertNil(labels[@"segment_name"]);
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+                fullLengthEndReceived = YES;
+            }
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            XCTAssertFalse(fullLengthEndReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return segmentEndReceived && fullLengthPlayReceived && fullLengthEndReceived;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    XCTAssertNil(self.mediaPlayerController.currentSegment);
+    XCTAssertNil(self.mediaPlayerController.selectedSegment);
+}
+
+- (void)testResetWhilePlayingSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect end event with segment labels
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testBlockedSegmentSelection
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect pause and play on the full-length (corresponding to the segment being skipped)
+    
+    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(fullLengthPauseReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPauseReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthPauseReceived && fullLengthPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekToSegment:segment withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSeekIntoBlockedSegment
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Expect pause / play for the full-length
+    
+    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(fullLengthPauseReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPauseReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthPauseReceived && fullLengthPlayReceived;
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(55., NSEC_PER_SEC) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testPlayStartingWithBlockedSegment
+{
+    // Expect a play attempt at 50, then a pause / play transition to 60 because of the blocked segment
+    
+    __block BOOL fullLengthPlayAt50Received = NO;
+    __block BOOL fullLengthPauseAt50Received = NO;
+    __block BOOL fullLengthPlayAt60Received = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"play"]) {
+            if ([labels[@"ns_st_po"] integerValue] / 1000 == 50) {
+                XCTAssertFalse(fullLengthPauseAt50Received);
+                XCTAssertFalse(fullLengthPlayAt60Received);
+                
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertNil(labels[@"segment_name"]);
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+                
+                fullLengthPlayAt50Received = YES;
+            }
+            else if ([labels[@"ns_st_po"] integerValue] / 1000 == 60) {
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertNil(labels[@"segment_name"]);
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+                
+                fullLengthPlayAt60Received = YES;
+            }
+            else {
+                XCTFail(@"Unexpected event %@", event);
+            }
+        }
+        else if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(fullLengthPlayAt60Received);
+            
+            XCTAssertEqual([labels[@"ns_st_po"] integerValue] / 1000, 50);
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            
+            fullLengthPauseAt50Received = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthPlayAt50Received && fullLengthPauseAt50Received && fullLengthPlayAt60Received;
+    }];
+    
+    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testBlockedSegmentPlaythrough
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Play for a while. Expect pause / play for the full-length when skipping over the segment
+    
+    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthPlayReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(fullLengthPauseReceived);
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPauseReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthPlayReceived);
+            
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertNil(labels[@"segment_name"]);
+            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            fullLengthPlayReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthPauseReceived && fullLengthPlayReceived;
+    }];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTrackingWhileIdle
+{
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForElapsedTimeInterval:5. withHandler:nil];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+}
+
+- (void)testDisableTrackingWhilePreparing
+{
+    // Wait until the player is preparing to play
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        XCTAssertEqual([notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue], SRGMediaPlayerPlaybackStatePreparing);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForElapsedTimeInterval:5. withHandler:nil];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePreparing);
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+}
+
+- (void)testDisableTrackingWhilePlaying
+{
+    // Wait until the media plays
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking while playing. Expect an end to be received
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"end");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTrackingWhilePlayingSegment
+{
+    // Wait until the media plays. Expect segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking while playing. Expect an end to be received with segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTrackingWhilePaused
+{
+    // Wait until the media plays
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Pause playback
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"pause");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking while paused. Expect an end to be received
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"end");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePaused);
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTrackingWhilePausedInSegment
+{
+    // Wait until the media plays. Expect segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Pause playback. Expect a pause with segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking while paused. Expect an end to be received with segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePaused);
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnableTrackingWhilePreparing
+{
+    // Wait until the player is preparing to play
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        XCTAssertEqual([notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue], SRGMediaPlayerPlaybackStatePreparing);
+        return YES;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Enable tracking. Expect plays to be received
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"play");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePreparing);
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnableTrackingWhilePreparingToPlaySegment
+{
+    // Wait until the player is preparing to play
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        XCTAssertEqual([notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue], SRGMediaPlayerPlaybackStatePreparing);
+        return YES;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Enable tracking. Expect plays to be received
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePreparing);
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnableTrackingWhilePlaying
+{
+    // Wait until the player is playing. No event must be received since tracking is not enabled yet
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Enable tracking. Expect a play to be received
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnableTrackingWhilePlayingSegment
+{
+    // Wait until the player is playing. No event must be received since tracking is not enabled yet
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.comScoreCustomInfo = @{ @"stream_name" : @"full",
+                                   @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Enable tracking. Expect a play to be received, with segment labels
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnableTrackingWhilePaused
+{
+    // Wait until the player is playing. No event must be received since tracking is not enabled yet
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Pause playback
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        XCTAssertEqual([notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue], SRGMediaPlayerPlaybackStatePaused);
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Wait a little bit in the paused state (to avoid the result of the pause notification immediately trapped below)
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Enable tracking. Expect a play (because the tracker starts), then a pause (reflecting the current state of the player) to be received
+    __block BOOL playReceived = NO;
+    __block BOOL pauseReceived = NO;
+    
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(playReceived);
+            XCTAssertFalse(pauseReceived);
+            playReceived = YES;
+        }
+        else if ([event isEqualToString:@"pause"]) {
+            XCTAssertFalse(pauseReceived);
+            pauseReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event received");
+        }
+        
+        return playReceived && pauseReceived;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePaused);
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTwiceTrackingWhilePlaying
+{
+    // Wait until the media plays
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking twice while playing. Expect a single end to be received
+    __block NSInteger endEventCount = 0;
+    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"end"]) {
+            ++endEventCount;
+        }
+        else {
+            XCTFail(@"Unexpected event received");
+        }
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = NO;
+    self.mediaPlayerController.tracked = NO;
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:5. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:endEventObserver];
+    }];
+    
+    // Check we have received the end notification only once
+    XCTAssertEqual(endEventCount, 1);
+}
+
+- (void)testEnableTrackingTwiceWhilePlaying
+{
+    // Wait until the media plays
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Start tracking twice while playing. Expect a single play to be received
+    __block NSInteger playEventCount = 0;
+    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"play"]) {
+            ++playEventCount;
+        }
+        else {
+            XCTFail(@"Unexpected event received");
+        }
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = YES;
+    self.mediaPlayerController.tracked = YES;
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:5. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:endEventObserver];
+    }];
+    
+    // Check we have received the end notification only once
+    XCTAssertEqual(playEventCount, 1);
+}
+
+@end
diff --git a/Tests/Sources/ComScoreTrackerTestCase.m b/Tests/Sources/ComScoreTrackerTestCase.m
new file mode 100644
index 00000000..cce6cab6
--- /dev/null
+++ b/Tests/Sources/ComScoreTrackerTestCase.m
@@ -0,0 +1,75 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "AnalyticsTestCase.h"
+#import "NSNotificationCenter+Tests.h"
+
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
+
+@interface ComScoreTrackerTestCase : AnalyticsTestCase
+
+@end
+
+@implementation ComScoreTrackerTestCase
+
+#pragma mark Tests
+
+- (void)testHiddenEvent
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertNil(event);
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Hidden event");
+        XCTAssertEqualObjects(labels[@"name"], @"app.hidden-event");
+        XCTAssertEqualObjects(labels[@"category"], @"app");
+        return YES;
+    }];
+    
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"Hidden event"];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+}
+
+- (void)testHiddenEventWithLabels
+{
+    [self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertNil(event);
+        XCTAssertEqualObjects(labels[@"srg_title"], @"Hidden event");
+        XCTAssertEqualObjects(labels[@"name"], @"app.hidden-event");
+        XCTAssertEqualObjects(labels[@"category"], @"app");
+        XCTAssertEqualObjects(labels[@"srg_evgroup"], @"toggle");
+        XCTAssertEqualObjects(labels[@"srg_evsource"], @"favorite_list");
+        XCTAssertEqualObjects(labels[@"srg_evvalue"], @"true");
+        XCTAssertEqualObjects(labels[@"custom_label"], @"custom_value");
+        return YES;
+    }];
+    
+    SRGAnalyticsHiddenEventLabels *labels = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels.type = @"toggle";
+    labels.source = @"favorite_list";
+    labels.value = @"true";
+    labels.comScoreCustomInfo = @{ @"custom_label" : @"custom_value" };
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"Hidden event"
+                                                            labels:labels];
+    
+    [self waitForExpectationsWithTimeout:5. handler:nil];
+}
+
+- (void)testHiddenEventWithEmptyTitle
+{
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForComScoreHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"Events with missing title must not be sent");
+    }];
+    
+    [self expectationForElapsedTimeInterval:5. withHandler:nil];
+    
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@""];
+    
+    [self waitForExpectationsWithTimeout:5. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+}
+
+@end
diff --git a/Tests/Sources/ConfigurationTestCase.m b/Tests/Sources/ConfigurationTestCase.m
new file mode 100644
index 00000000..058e7992
--- /dev/null
+++ b/Tests/Sources/ConfigurationTestCase.m
@@ -0,0 +1,85 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "AnalyticsTestCase.h"
+
+@interface ConfigurationTestCase : AnalyticsTestCase
+
+@end
+
+@implementation ConfigurationTestCase
+
+#pragma mark Tests
+
+- (void)testCreation
+{
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
+                                                                                                       container:7
+                                                                                             comScoreVirtualSite:@"comscore-vsite"
+                                                                                             netMetrixIdentifier:@"netmetrix-identifier"];
+    XCTAssertFalse(configuration.centralized);
+    XCTAssertFalse(configuration.unitTesting);
+    XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
+    XCTAssertEqual(configuration.site, 3667);
+    XCTAssertEqual(configuration.container, 7);
+    XCTAssertEqualObjects(configuration.comScoreVirtualSite, @"comscore-vsite");
+    XCTAssertEqualObjects(configuration.netMetrixIdentifier, @"netmetrix-identifier");
+}
+
+- (void)testCentralizedConfiguration
+{
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
+                                                                                                       container:7
+                                                                                             comScoreVirtualSite:@"comscore-vsite"
+                                                                                             netMetrixIdentifier:@"netmetrix-identifier"];
+    configuration.centralized = YES;
+    
+    XCTAssertTrue(configuration.centralized);
+    XCTAssertFalse(configuration.unitTesting);
+    XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
+    XCTAssertEqual(configuration.site, 3666);
+    XCTAssertEqual(configuration.container, 7);
+    XCTAssertEqualObjects(configuration.comScoreVirtualSite, @"comscore-vsite");
+    XCTAssertEqualObjects(configuration.netMetrixIdentifier, @"netmetrix-identifier");
+}
+
+- (void)testUnitTestingConfiguration
+{
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
+                                                                                                       container:7
+                                                                                             comScoreVirtualSite:@"comscore-vsite"
+                                                                                             netMetrixIdentifier:@"netmetrix-identifier"];
+    configuration.unitTesting = YES;
+    
+    XCTAssertFalse(configuration.centralized);
+    XCTAssertTrue(configuration.unitTesting);
+    XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
+    XCTAssertEqual(configuration.site, 3667);
+    XCTAssertEqual(configuration.container, 7);
+    XCTAssertEqualObjects(configuration.comScoreVirtualSite, @"comscore-vsite");
+    XCTAssertEqualObjects(configuration.netMetrixIdentifier, @"netmetrix-identifier");
+}
+
+- (void)testCopy
+{
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
+                                                                                                       container:7
+                                                                                             comScoreVirtualSite:@"comscore-vsite"
+                                                                                             netMetrixIdentifier:@"netmetrix-identifier"];
+    configuration.centralized = YES;
+    configuration.unitTesting = YES;
+    
+    SRGAnalyticsConfiguration *configurationCopy = [configuration copy];
+    XCTAssertEqual(configuration.centralized, configurationCopy.centralized);
+    XCTAssertEqual(configuration.unitTesting, configurationCopy.unitTesting);
+    XCTAssertEqualObjects(configuration.businessUnitIdentifier, configurationCopy.businessUnitIdentifier);
+    XCTAssertEqual(configuration.site, configurationCopy.site);
+    XCTAssertEqual(configuration.container, configurationCopy.container);
+    XCTAssertEqualObjects(configuration.comScoreVirtualSite, configurationCopy.comScoreVirtualSite);
+    XCTAssertEqualObjects(configuration.netMetrixIdentifier, configurationCopy.netMetrixIdentifier);
+}
+
+@end
diff --git a/Tests/Sources/DataProviderTestCase.m b/Tests/Sources/DataProviderTestCase.m
index f2007391..5f100c93 100644
--- a/Tests/Sources/DataProviderTestCase.m
+++ b/Tests/Sources/DataProviderTestCase.m
@@ -57,10 +57,11 @@ - (void)testPrepareToPlayMediaComposition
     XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePaused);
     
     // Start playback and check labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"ns_st_ep"], @"Archive footage of the man and his moods");
-        XCTAssertEqualObjects(labels[@"srg_mqual"], @"HD");
+    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_segment"], @"Archive footage of the man and his moods");
+        XCTAssertEqualObjects(labels[@"media_streaming_quality"], @"HD");
+        XCTAssertEqualObjects(labels[@"media_urn"], @"urn:swi:video:42297626");
         return YES;
     }];
     
@@ -92,15 +93,16 @@ - (void)testPlayMediaComposition
 - (void)testPlaySegmentInMediaComposition
 {
     // Use a segment id as video id, expect segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"ns_st_ep"], @"«26 minutes» – web first: Welsche Satire auf Hochdeutsch!");
-        XCTAssertEqualObjects(labels[@"srg_mqual"], @"HD");
+    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_segment"], @"Schweizer Pioniere: Die Fitnessbloggerin in der Türkei");
+        XCTAssertEqualObjects(labels[@"media_streaming_quality"], @"HD");
+        XCTAssertEqualObjects(labels[@"media_urn"], @"urn:srf:video:27af89ad-2408-40e5-8318-96e25d3e003b");
         return YES;
     }];
     
     SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL() businessUnitIdentifier:SRGDataProviderBusinessUnitIdentifierSRF];
-    [[dataProvider videoMediaCompositionWithUid:@"99ac4dd4-8cd4-4883-8c80-0373d37cf0ad" chaptersOnly:NO completionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSError * _Nullable error) {
+    [[dataProvider videoMediaCompositionWithUid:@"27af89ad-2408-40e5-8318-96e25d3e003b" chaptersOnly:NO completionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSError * _Nullable error) {
         XCTAssertNotNil(mediaComposition);
         
         [self.mediaPlayerController playMediaComposition:mediaComposition withPreferredStreamingMethod:SRGStreamingMethodNone quality:SRGQualityHD startBitRate:0 userInfo:nil resume:YES completionHandler:^(NSError * _Nonnull error) {
diff --git a/Tests/Sources/Helpers/AnalyticsTestCase.h b/Tests/Sources/Helpers/AnalyticsTestCase.h
index f503284c..36719757 100644
--- a/Tests/Sources/Helpers/AnalyticsTestCase.h
+++ b/Tests/Sources/Helpers/AnalyticsTestCase.h
@@ -9,15 +9,25 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef BOOL (^EventExpectationHandler)(NSString *type, NSDictionary *labels);
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
 
 @interface AnalyticsTestCase : XCTestCase
 
 /**
- *  Expectation for global comScore hidden event notifications
+ *  Expectation for general hidden event notifications.
  */
 - (XCTestExpectation *)expectationForHiddenEventNotificationWithHandler:(EventExpectationHandler)handler;
 
+/**
+ *  Expectation for playback-related hidden event notifications.
+ */
+- (XCTestExpectation *)expectationForHiddenPlaybackEventNotificationWithHandler:(EventExpectationHandler)handler;
+
+/**
+ *  Expectation for general ComScore hidden event notifications.
+ */
+- (XCTestExpectation *)expectationForComScoreHiddenEventNotificationWithHandler:(EventExpectationHandler)handler;
+
 /**
  *  Expectation fulfilled after some given time interval (in seconds), calling the optionally provided handler. Can
  *  be useful for ensuring nothing unexpected occurs during some time
diff --git a/Tests/Sources/Helpers/AnalyticsTestCase.m b/Tests/Sources/Helpers/AnalyticsTestCase.m
index 7e6458a5..7e0394d7 100644
--- a/Tests/Sources/Helpers/AnalyticsTestCase.m
+++ b/Tests/Sources/Helpers/AnalyticsTestCase.m
@@ -13,6 +13,41 @@ @implementation AnalyticsTestCase
 #pragma mark Helpers
 
 - (XCTestExpectation *)expectationForHiddenEventNotificationWithHandler:(EventExpectationHandler)handler
+{
+    return [self expectationForNotification:SRGAnalyticsRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsLabelsKey];
+        
+        NSString *event = labels[@"event_id"];
+        if ([event isEqualToString:@"screen"]) {
+            return NO;
+        }
+        
+        return handler(event, labels);
+    }];
+}
+
+- (XCTestExpectation *)expectationForHiddenPlaybackEventNotificationWithHandler:(EventExpectationHandler)handler
+{
+    return [self expectationForNotification:SRGAnalyticsRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsLabelsKey];
+        
+        static dispatch_once_t s_onceToken;
+        static NSArray<NSString *> *s_playerSingleHiddenEvents;
+        dispatch_once(&s_onceToken, ^{
+            s_playerSingleHiddenEvents = @[@"play", @"pause", @"seek", @"stop", @"eof"];
+        });
+        
+        NSString *event = labels[@"event_id"];
+        if ([s_playerSingleHiddenEvents containsObject:event]) {
+            return handler(event, labels);
+        }
+        else {
+            return NO;
+        }
+    }];
+}
+
+- (XCTestExpectation *)expectationForComScoreHiddenEventNotificationWithHandler:(EventExpectationHandler)handler
 {
     return [self expectationForNotification:SRGAnalyticsComScoreRequestNotification object:nil handler:^BOOL(NSNotification * _Nonnull notification) {
         NSDictionary *labels = notification.userInfo[SRGAnalyticsComScoreLabelsKey];
diff --git a/Tests/Sources/Helpers/NSNotificationCenter+Tests.h b/Tests/Sources/Helpers/NSNotificationCenter+Tests.h
index b1b893fb..f03d7e57 100644
--- a/Tests/Sources/Helpers/NSNotificationCenter+Tests.h
+++ b/Tests/Sources/Helpers/NSNotificationCenter+Tests.h
@@ -11,6 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface NSNotificationCenter (Tests)
 
 - (id<NSObject>)addObserverForHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block;
+- (id<NSObject>)addObserverForPlayerSingleHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block;
+
+- (id<NSObject>)addObserverForComScoreHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block;
 
 @end
 
diff --git a/Tests/Sources/Helpers/NSNotificationCenter+Tests.m b/Tests/Sources/Helpers/NSNotificationCenter+Tests.m
index d7ca0b06..edbef01d 100644
--- a/Tests/Sources/Helpers/NSNotificationCenter+Tests.m
+++ b/Tests/Sources/Helpers/NSNotificationCenter+Tests.m
@@ -11,6 +11,41 @@
 @implementation NSNotificationCenter (Tests)
 
 - (id<NSObject>)addObserverForHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block
+{
+    return [self addObserverForName:SRGAnalyticsRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsLabelsKey];
+        
+        NSString *event = labels[@"event_id"];
+        if ([event isEqualToString:@"screen"]) {
+            return;
+        }
+        
+        block(event, labels);
+    }];
+}
+
+- (id<NSObject>)addObserverForPlayerSingleHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block
+{
+    return [self addObserverForName:SRGAnalyticsRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
+        NSDictionary *labels = notification.userInfo[SRGAnalyticsLabelsKey];
+        
+        static dispatch_once_t s_onceToken;
+        static NSArray<NSString *> *s_playerSingleHiddenEvents;
+        dispatch_once(&s_onceToken, ^{
+            s_playerSingleHiddenEvents = @[@"play", @"pause", @"seek", @"stop", @"eof"];
+        });
+        
+        NSString *event = labels[@"event_id"];
+        if ([s_playerSingleHiddenEvents containsObject:event]) {
+            block(event, labels);
+        }
+        else {
+            return;
+        }
+    }];
+}
+
+- (id<NSObject>)addObserverForComScoreHiddenEventNotificationUsingBlock:(void (^)(NSString *event, NSDictionary *labels))block
 {
     return [self addObserverForName:SRGAnalyticsComScoreRequestNotification object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
         NSDictionary *labels = notification.userInfo[SRGAnalyticsComScoreLabelsKey];
diff --git a/Tests/Sources/Helpers/Segment.m b/Tests/Sources/Helpers/Segment.m
index 6475f228..91cefb0f 100644
--- a/Tests/Sources/Helpers/Segment.m
+++ b/Tests/Sources/Helpers/Segment.m
@@ -51,10 +51,14 @@ - (BOOL)srg_isHidden
 
 #pragma mark SRGAnalyticsSegment protocol
 
-- (NSDictionary<NSString *,NSString *> *)srg_analyticsLabels
+- (SRGAnalyticsStreamLabels *)srg_analyticsLabels
 {
-    return @{ @"segment_name" : self.name,
-              @"overridable_name" : self.name };
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"segment_name" : self.name,
+                           @"overridable_name" : self.name };
+    labels.comScoreCustomInfo = @{ @"segment_name" : self.name,
+                               @"overridable_name" : self.name };
+    return labels;
 }
 
 #pragma mark Description
diff --git a/Tests/Sources/Helpers/TrackerSingletonSetup.m b/Tests/Sources/Helpers/TrackerSingletonSetup.m
index e9210644..12e1b0b0 100644
--- a/Tests/Sources/Helpers/TrackerSingletonSetup.m
+++ b/Tests/Sources/Helpers/TrackerSingletonSetup.m
@@ -9,7 +9,10 @@
 // The singleton can be only setup once. Do not perform in a test case setup
 __attribute__((constructor)) static void SetupTestSingletonTracker(void)
 {
-    [[SRGAnalyticsTracker sharedTracker] startWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierTEST
-                                                     comScoreVirtualSite:@"rts-app-test-v"
-                                                     netMetrixIdentifier:@"test"];
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierRTS
+                                                                                                       container:10
+                                                                                             comScoreVirtualSite:@"rts-app-test-v"
+                                                                                             netMetrixIdentifier:@"test"];
+    configuration.unitTesting = YES;
+    [[SRGAnalyticsTracker sharedTracker] startWithConfiguration:configuration];
 }
diff --git a/Tests/Sources/MediaPlayerTestCase.m b/Tests/Sources/MediaPlayerTestCase.m
index 0d99b3d5..407bc61b 100644
--- a/Tests/Sources/MediaPlayerTestCase.m
+++ b/Tests/Sources/MediaPlayerTestCase.m
@@ -10,7 +10,7 @@
 
 #import <SRGAnalytics_MediaPlayer/SRGAnalytics_MediaPlayer.h>
 
-typedef BOOL (^EventExpectationHandler)(NSString *type, NSDictionary *labels);
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
 
 static NSURL *OnDemandTestURL(void)
 {
@@ -19,12 +19,12 @@
 
 static NSURL *LiveTestURL(void)
 {
-    return [NSURL URLWithString:@"http://fr-par-iphone-2.cdn.hexaglobe.net/streaming/euronews_ewns/9-live.m3u8"];
+    return [NSURL URLWithString:@"http://ndr_fs-lh.akamaihd.net/i/ndrfs_nds@119224/master.m3u8?dw=0"];
 }
 
 static NSURL *DVRTestURL(void)
 {
-    return [NSURL URLWithString:@"https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR"];
+    return [NSURL URLWithString:@"http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8"];
 }
 
 @interface MediaPlayerTestCase : AnalyticsTestCase
@@ -40,7 +40,6 @@ @implementation MediaPlayerTestCase
 - (void)setUp
 {
     self.mediaPlayerController = [[SRGMediaPlayerController alloc] init];
-    self.mediaPlayerController.liveTolerance = 10.;
 }
 
 - (void)tearDown
@@ -54,7 +53,7 @@ - (void)tearDown
 - (void)testPrepareToPlay
 {
     // Prepare the player until it is paused. No event must be received
-    id prepareObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id prepareObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when preparing a player");
     }];
     
@@ -63,8 +62,8 @@ - (void)testPrepareToPlay
     }];
     
     // Now playing must trigger a play event
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         return YES;
     }];
     
@@ -72,8 +71,8 @@ - (void)testPrepareToPlay
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         return YES;
     }];
     
@@ -84,15 +83,9 @@ - (void)testPrepareToPlay
 
 - (void)testPlaybackToEnd
 {
-    // Also check internal comScore important measurement values for playback duration (ns_st_pa and ns_st_pt). Ensure
-    // we did not mess with them by mistake
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        
-        // comScore internal duration labels
-        XCTAssertNil(labels[@"ns_st_pa"]);
-        XCTAssertNil(labels[@"ns_st_pt"]);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -100,13 +93,9 @@ - (void)testPlaybackToEnd
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        
-        // comScore internal duration labels
-        XCTAssertNotNil(labels[@"ns_st_pa"]);
-        XCTAssertNotEqualObjects(labels[@"ns_st_pa"], @"0");
-        XCTAssertNotEqualObjects(labels[@"ns_st_pt"], @"0");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"seek");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -116,12 +105,9 @@ - (void)testPlaybackToEnd
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        
-        // comScore internal duration labels
-        XCTAssertNil(labels[@"ns_st_pa"]);
-        XCTAssertNil(labels[@"ns_st_pt"]);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertNotEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -129,13 +115,9 @@ - (void)testPlaybackToEnd
     
     // Let playback finish normally
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
-        
-        // comScore internal duration labels
-        XCTAssertNotNil(labels[@"ns_st_pa"]);
-        XCTAssertNotEqualObjects(labels[@"ns_st_pa"], @"0");
-        XCTAssertNotEqualObjects(labels[@"ns_st_pt"], @"0");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"eof");
+        XCTAssertNotEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -144,8 +126,9 @@ - (void)testPlaybackToEnd
 
 - (void)testPlayStop
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -153,8 +136,19 @@ - (void)testPlayStop
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     
@@ -165,8 +159,9 @@ - (void)testPlayStop
 
 - (void)testPlayReset
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -174,8 +169,19 @@ - (void)testPlayReset
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     
@@ -187,12 +193,12 @@ - (void)testPlayReset
 - (void)testPlayPausePlay
 {
     __block NSInteger count1 = 0;
-    id eventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         ++count1;
     }];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        return [type isEqualToString:@"play"];
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
     }];
     
     [self.mediaPlayerController playURL:OnDemandTestURL()];
@@ -205,12 +211,12 @@ - (void)testPlayPausePlay
     XCTAssertEqual(count1, 1);
     
     __block NSInteger count2 = 0;
-    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         ++count2;
     }];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        return [type isEqualToString:@"pause"];
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"pause"];
     }];
     
     [self.mediaPlayerController pause];
@@ -223,12 +229,12 @@ - (void)testPlayPausePlay
     XCTAssertEqual(count2, 1);
     
     __block NSInteger count3 = 0;
-    id eventObserver3 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver3 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         ++count3;
     }];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        return [type isEqualToString:@"play"];
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
     }];
     
     [self.mediaPlayerController play];
@@ -239,7 +245,82 @@ - (void)testPlayPausePlay
     
     [self expectationForElapsedTimeInterval:3. withHandler:nil];
     
-    id eventObserver4 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver4 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
+        // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
+        NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
+              "captured via KVO in our implementation. Those changes do not harm but cannot be tested reliably", @(self.mediaPlayerController.playbackState));
+    }];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver4];
+    }];
+}
+
+- (void)testPlaySeekPlay
+{
+    __block NSInteger count1 = 0;
+    id eventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count1;
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver1];
+    }];
+    
+    // One event expected: play
+    XCTAssertEqual(count1, 1);
+    
+    __block NSInteger count2 = 0;
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count2;
+    }];
+    
+    // Expect seek - play transition with labels
+    
+    __block BOOL seekReceived = NO;
+    __block BOOL playReceived = NO;
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(seekReceived);
+            XCTAssertFalse(playReceived);
+            
+            XCTAssertEqualObjects(labels[@"media_position"], @"0");
+            seekReceived = YES;
+        }
+        else if ([event isEqualToString:@"play"]) {
+            XCTAssertTrue(seekReceived);
+            XCTAssertFalse(playReceived);
+            
+            XCTAssertEqualObjects(labels[@"media_position"], @"2");
+            playReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return seekReceived && playReceived;
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(2., NSEC_PER_SEC) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver2];
+    }];
+    
+    // Two events expected: seek and play
+    XCTAssertEqual(count2, 2);
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    id eventObserver4 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
         // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
         NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
@@ -251,10 +332,102 @@ - (void)testPlayPausePlay
     }];
 }
 
+- (void)testPlayPauseSeekPause
+{
+    __block NSInteger count1 = 0;
+    id eventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count1;
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"play"];
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver1];
+    }];
+    
+    // One event expected: play
+    XCTAssertEqual(count1, 1);
+    
+    __block NSInteger count2 = 0;
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count2;
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [event isEqualToString:@"pause"];
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver2];
+    }];
+    
+    // One event expected: pause
+    XCTAssertEqual(count2, 1);
+    
+    __block NSInteger count3 = 0;
+    id eventObserver3 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        ++count3;
+    }];
+    
+    // Expect seek - pause transition with labels
+    
+    __block BOOL seekReceived = NO;
+    __block BOOL pauseReceived = NO;
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(seekReceived);
+            XCTAssertFalse(pauseReceived);
+            
+            XCTAssertEqualObjects(labels[@"media_position"], @"0");
+            seekReceived = YES;
+        }
+        else if ([event isEqualToString:@"pause"]) {
+            XCTAssertTrue(seekReceived);
+            XCTAssertFalse(pauseReceived);
+            XCTAssertEqualObjects(labels[@"media_position"], @"2");
+            pauseReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return seekReceived && pauseReceived;
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(2., NSEC_PER_SEC) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver3];
+    }];
+    
+    // Two events expected: seek and pause
+    XCTAssertEqual(count3, 2);
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    id eventObserver5 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
+        // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
+        NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
+              "captured via KVO in our implementation. Those changes do not harm but cannot be tested reliably", @(self.mediaPlayerController.playbackState));
+    }];
+    
+    [self waitForExpectationsWithTimeout:30. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver5];
+    }];
+}
+
 - (void)testConsecutiveMedia
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         return YES;
     }];
     
@@ -262,8 +435,8 @@ - (void)testConsecutiveMedia
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         return YES;
     }];
     
@@ -271,15 +444,15 @@ - (void)testConsecutiveMedia
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         return YES;
     }];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         return YES;
     }];
     
@@ -290,7 +463,7 @@ - (void)testConsecutiveMedia
 
 - (void)testMediaError
 {
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received");
     }];
     
@@ -305,17 +478,12 @@ - (void)testMediaError
     }];
 }
 
-- (void)testGlobalLabels
+- (void)testCommonLabels
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        
-        XCTAssertEqualObjects(labels[@"ns_st_mp"], @"SRGMediaPlayer");
-        XCTAssertEqualObjects(labels[@"ns_st_pu"], SRGAnalyticsMarketingVersion());
-        XCTAssertEqualObjects(labels[@"ns_st_mv"], SRGMediaPlayerMarketingVersion());
-        XCTAssertEqualObjects(labels[@"ns_st_it"], @"c");
-        XCTAssertEqualObjects(labels[@"ns_vsite"], @"rts-app-test-v");
-        XCTAssertEqualObjects(labels[@"srg_ptype"], @"p_app_ios");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_player_display"], @"SRGMediaPlayer");
+        XCTAssertEqualObjects(labels[@"media_player_version"], SRGMediaPlayerMarketingVersion());
         return YES;
     }];
     
@@ -326,22 +494,9 @@ - (void)testGlobalLabels
 
 - (void)testOnDemandLabels
 {
-    // Check that these labels are constant between states (for some, the value might differ, but they must
-    // in which case we test they are constantly availble or unavailable)
-    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
-        XCTAssertNotNil(labels[@"ns_st_br"]);
-        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
-        XCTAssertNotNil(labels[@"ns_st_vo"]);
-        XCTAssertNil(labels[@"ns_ap_ot"]);
-        
-        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
-        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
-    };
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertNil(labels[@"srg_timeshift"]);
-        checkMainLabels(labels);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertNil(labels[@"media_timeshift"]);
         return YES;
     }];
     
@@ -349,10 +504,9 @@ - (void)testOnDemandLabels
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        XCTAssertNil(labels[@"srg_timeshift"]);
-        checkMainLabels(labels);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
+        XCTAssertNil(labels[@"media_timeshift"]);
         return YES;
     }];
     
@@ -360,10 +514,9 @@ - (void)testOnDemandLabels
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
-        XCTAssertNil(labels[@"srg_timeshift"]);
-        checkMainLabels(labels);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertNil(labels[@"media_timeshift"]);
         return YES;
     }];
     
@@ -374,33 +527,38 @@ - (void)testOnDemandLabels
 
 - (void)testLiveLabels
 {
-    // Check that these labels are constant between states (for some, the value might differ, but they must
-    // in which case we test they are constantly availble or unavailable)
-    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
-        XCTAssertNotNil(labels[@"ns_st_br"]);
-        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
-        XCTAssertNotNil(labels[@"ns_st_vo"]);
-        XCTAssertNil(labels[@"ns_ap_ot"]);
-        
-        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
-        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
-    };
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
-        checkMainLabels(labels);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
-    [self.mediaPlayerController playURL:LiveTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:@{ @"test_info" : @"test" } userInfo:nil];
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"test_info" : @"test" };
+    
+    [self.mediaPlayerController playURL:LiveTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:nil
+                        analyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
-        checkMainLabels(labels);
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     
@@ -408,10 +566,20 @@ - (void)testLiveLabels
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
-        XCTAssertNil(labels[@"srg_timeshift"]);
-        checkMainLabels(labels);
+    // Pause for a while. No stream events must be received
+    eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when it's in pause");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     
@@ -420,24 +588,86 @@ - (void)testLiveLabels
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
-- (void)testDVRLabels
+- (void)testLiveStopLive
 {
-    // Check that these labels are constant between states (for some, the value might differ, but they must
-    // in which case we test they are constantly availble or unavailable)
-    void (^checkMainLabels)(NSDictionary *) = ^(NSDictionary *labels) {
-        XCTAssertNotNil(labels[@"ns_st_br"]);
-        XCTAssertEqualObjects(labels[@"ns_st_ws"], @"norm");
-        XCTAssertNotNil(labels[@"ns_st_vo"]);
-        XCTAssertNil(labels[@"ns_ap_ot"]);
-        
-        XCTAssertEqualObjects(labels[@"ns_st_cs"], @"0x0");
-        XCTAssertEqualObjects(labels[@"srg_screen_type"], @"default");
-    };
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"test_info" : @"test" };
+    
+    [self.mediaPlayerController playURL:LiveTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:nil
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController stop];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Pause for a while. No stream events must be received
+    eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when it's in pause");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
+        return YES;
+    }];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
-        checkMainLabels(labels);
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDVRLabels
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
@@ -445,32 +675,50 @@ - (void)testDVRLabels
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        XCTAssertEqualObjects(labels[@"srg_timeshift"], @"0");
-        checkMainLabels(labels);
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"seek");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     
-    // Live tolerance has been set to 10 for tests, duration of the DVR window for the test stream is about 45 seconds
-    CMTime pastTime = CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), CMTimeMakeWithSeconds(20., NSEC_PER_SEC));
+    CMTime pastTime = CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), CMTimeMakeWithSeconds(45., NSEC_PER_SEC));
     [self.mediaPlayerController seekPreciselyToTime:pastTime withCompletionHandler:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertNotNil(labels[@"srg_timeshift"]);
-        XCTAssertNotEqualObjects(labels[@"srg_timeshift"], @"0");
-        checkMainLabels(labels);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"45");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1");
         return YES;
     }];
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
-        XCTAssertNil(labels[@"srg_timeshift"]);
-        checkMainLabels(labels);
+    // Play for a while. No stream events must be received
+    eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertNotNil(labels[@"media_timeshift"]); // Can't compare to 45, because of chunk size
+        XCTAssertEqualObjects(labels[@"media_position"], @"2");
         return YES;
     }];
     
@@ -481,9 +729,9 @@ - (void)testDVRLabels
 
 - (void)testVolumeLabel
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"ns_st_vo"], @"0");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_volume"], @"0");
         return YES;
     }];
     
@@ -494,9 +742,9 @@ - (void)testVolumeLabel
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        XCTAssertNotEqualObjects(labels[@"ns_st_vo"], @"0");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
+        XCTAssertEqualObjects(labels[@"media_volume"], @"100");         // 100 when run with XCTest
         return YES;
     }];
     
@@ -506,60 +754,159 @@ - (void)testVolumeLabel
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
-- (void)testNonSelectedSegmentPlayback
+- (void)testBandwidthLabel
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
-        XCTAssertNil(labels[@"segment_name"]);
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertNotEqualObjects(labels[@"media_bandwidth"], @"0");
         return YES;
     }];
     
-    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                        @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Let the segment be played through. No events must be received
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
-        XCTFail(@"No event must be received");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertNil(labels[@"media_bandwidth"]);
+        return YES;
     }];
     
-    [self expectationForElapsedTimeInterval:3. withHandler:nil];
-    
-    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
-        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
-    }];
+    [self.mediaPlayerController reset];
     
-    // Pause playback. Expect full-length information
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
-        XCTAssertNil(labels[@"segment_name"]);
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testEnvironment
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_embedding_environment"], @"preprod");
         return YES;
     }];
     
-    [self.mediaPlayerController pause];
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Resume playback. Expect full-length information
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
-        XCTAssertNil(labels[@"segment_name"]);
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_embedding_environment"], @"preprod");
         return YES;
     }];
     
-    [self.mediaPlayerController play];
+    [self.mediaPlayerController reset];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testSubtitles
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_subtitles_on"], @"true");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_subtitles_on"], @"false");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testNoSubtitles
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"media_subtitles_on"], @"false");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:LiveTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"media_subtitles_on"], @"false");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testNonSelectedSegmentPlayback
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Let the segment be played through. No events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received");
+    }];
+    
+    [self expectationForElapsedTimeInterval:3. withHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Pause playback. Expect full-length information
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Resume playback. Expect full-length information
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertNil(labels[@"segment_name"]);
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
     
-    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    id eventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         // Also see http://stackoverflow.com/questions/14565405/avplayer-pauses-for-no-obvious-reason and
         // the demo project https://github.com/defagos/radars/tree/master/unexpected-player-rate-changes
         NSLog(@"[AVPlayer probable bug]: Unexpected state change to %@. Fast play - pause sequences can induce unexpected rate changes "
@@ -575,26 +922,35 @@ - (void)testNonSelectedSegmentPlayback
 
 - (void)testSelectedSegmentPlayback
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"2");
         return YES;
     }];
     
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Pause playback. Expect segment information
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"2");
         return YES;
     }];
     
@@ -603,11 +959,12 @@ - (void)testSelectedSegmentPlayback
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Resume playback. Expect segment information
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"2");
         return YES;
     }];
     
@@ -619,17 +976,25 @@ - (void)testSelectedSegmentPlayback
 - (void)testInitialSegmentSelectionAndPlaythrough
 {
     // No end on full since we start with the segment, only a play for the segment
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
@@ -639,14 +1004,15 @@ - (void)testInitialSegmentSelectionAndPlaythrough
     __block BOOL segmentEndReceived = NO;
     __block BOOL fullPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"eof"]) {
             XCTAssertFalse(segmentEndReceived);
             XCTAssertFalse(fullPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"media_position"], @"53");
             segmentEndReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
@@ -655,6 +1021,7 @@ - (void)testInitialSegmentSelectionAndPlaythrough
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            XCTAssertEqualObjects(labels[@"media_position"], @"53");
             fullPlayReceived = YES;
         }
         else {
@@ -667,35 +1034,104 @@ - (void)testInitialSegmentSelectionAndPlaythrough
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
+- (void)testPrepareInitialSegmentSelectionAndPlayAndReset
+{
+    // Prepare the player until it is paused. No event must be received
+    id prepareObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when preparing a player");
+    }];
+    
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
+    [self.mediaPlayerController prepareToPlayURL:OnDemandTestURL()
+                                         atIndex:0
+                                      inSegments:@[segment]
+                             withAnalyticsLabels:labels
+                                        userInfo:nil
+                               completionHandler:^{
+                                   [[NSNotificationCenter defaultCenter] removeObserver:prepareObserver];
+                               }];
+    
+    // Now playing must trigger a play event
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController reset];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
 - (void)testSegmentSelectionAfterStartOnFullLength
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertNil(labels[@"segment_name"]);
         XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
         return YES;
     }];
     
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                        @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
     // When selecting a segment, usual playback events due to seeking must be inhibited
     
     __block BOOL fullEndReceived = NO;
     __block BOOL segmentPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"stop"]) {
             XCTAssertFalse(fullEndReceived);
             XCTAssertFalse(segmentPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            XCTAssertEqualObjects(labels[@"media_position"], @"1");
             fullEndReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
@@ -704,6 +1140,7 @@ - (void)testSegmentSelectionAfterStartOnFullLength
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
             segmentPlayReceived = YES;
         }
         else {
@@ -720,18 +1157,27 @@ - (void)testSegmentSelectionAfterStartOnFullLength
 
 - (void)testSegmentSelectionWhilePlayingSelectedSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
     Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
     Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(100., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment1, segment2] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                            @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
@@ -740,14 +1186,15 @@ - (void)testSegmentSelectionWhilePlayingSelectedSegment
     __block BOOL segment1EndReceived = NO;
     __block BOOL segment2PlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"stop"]) {
             XCTAssertFalse(segment1EndReceived);
             XCTAssertFalse(segment2PlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
             segment1EndReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
@@ -756,6 +1203,7 @@ - (void)testSegmentSelectionWhilePlayingSelectedSegment
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment2");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment2");
+            XCTAssertEqualObjects(labels[@"media_position"], @"100");
             segment2PlayReceived = YES;
         }
         else {
@@ -772,18 +1220,27 @@ - (void)testSegmentSelectionWhilePlayingSelectedSegment
 
 - (void)testTransitionFromSelectedSegmentIntoNonSelectedContiguousSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"media_position"], @"20");
         return YES;
     }];
     
     Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(20., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
     Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(23., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment1, segment2] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                            @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
@@ -793,14 +1250,15 @@ - (void)testTransitionFromSelectedSegmentIntoNonSelectedContiguousSegment
     __block BOOL segment1EndReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"eof"]) {
             XCTAssertFalse(segment1EndReceived);
             XCTAssertFalse(fullLengthPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+            XCTAssertEqualObjects(labels[@"media_position"], @"23");
             segment1EndReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
@@ -809,6 +1267,7 @@ - (void)testTransitionFromSelectedSegmentIntoNonSelectedContiguousSegment
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            XCTAssertEqualObjects(labels[@"media_position"], @"23");
             fullLengthPlayReceived = YES;
         }
         else {
@@ -823,17 +1282,26 @@ - (void)testTransitionFromSelectedSegmentIntoNonSelectedContiguousSegment
 
 - (void)testSegmentRepeatedSelection
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
@@ -842,14 +1310,15 @@ - (void)testSegmentRepeatedSelection
     __block BOOL segmentEndReceived = NO;
     __block BOOL segmentPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"stop"]) {
             XCTAssertFalse(segmentEndReceived);
             XCTAssertFalse(segmentPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
             segmentEndReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
@@ -858,6 +1327,7 @@ - (void)testSegmentRepeatedSelection
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
             segmentPlayReceived = YES;
         }
         else {
@@ -874,47 +1344,58 @@ - (void)testSegmentRepeatedSelection
 
 - (void)testSeekOutsideSelectedSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
     Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
     Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(60., NSEC_PER_SEC), CMTimeMakeWithSeconds(20., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment1, segment2] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                            @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment1, segment2]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Expect transition into the full-length since, even if seeking resumes in another segment (since this segment has
-    // not been selected, we don't want to track it). Because of a seek, a pause in the segment is expected first
+    // not been selected, we don't want to track it)
     
-    __block BOOL segment1PauseReceived = NO;
-    __block BOOL segment1EndReceived = NO;
+    __block BOOL segment1SeekReceived = NO;
+    __block BOOL segment1StopReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(segment1PauseReceived);
-            XCTAssertFalse(segment1EndReceived);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(segment1SeekReceived);
+            XCTAssertFalse(segment1StopReceived);
             XCTAssertFalse(fullLengthPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
-            segment1PauseReceived = YES;
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
+            segment1SeekReceived = YES;
         }
-        else if ([event isEqualToString:@"end"]) {
-            XCTAssertFalse(segment1EndReceived);
+        else if ([event isEqualToString:@"stop"]) {
+            XCTAssertFalse(segment1StopReceived);
             XCTAssertFalse(fullLengthPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
-            segment1EndReceived = YES;
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
+            segment1StopReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(fullLengthPlayReceived);
@@ -922,10 +1403,11 @@ - (void)testSeekOutsideSelectedSegment
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            XCTAssertEqualObjects(labels[@"media_position"], @"70");
             fullLengthPlayReceived = YES;
         }
         
-        return segment1PauseReceived && segment1EndReceived && fullLengthPlayReceived;
+        return segment1SeekReceived && segment1StopReceived && fullLengthPlayReceived;
     }];
     
     [self.mediaPlayerController seekPreciselyToTime:CMTimeAdd(CMTimeRangeGetEnd(segment1.srg_timeRange), CMTimeMakeWithSeconds(10., NSEC_PER_SEC)) withCompletionHandler:nil];
@@ -935,34 +1417,44 @@ - (void)testSeekOutsideSelectedSegment
 
 - (void)testSeekWithinSelectedSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Expect play - pause transition with segment labels
+    // Expect seek - play transition with segment labels
     
-    __block BOOL segmentPauseReceived = NO;
+    __block BOOL segmentSeekReceived = NO;
     __block BOOL segmentPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(segmentPauseReceived);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(segmentSeekReceived);
             XCTAssertFalse(segmentPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
-            segmentPauseReceived = YES;
+            XCTAssertEqualObjects(labels[@"media_position"], @"50");
+            segmentSeekReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(segmentPlayReceived);
@@ -970,13 +1462,14 @@ - (void)testSeekWithinSelectedSegment
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
             XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+            XCTAssertEqualObjects(labels[@"media_position"], @"53");
             segmentPlayReceived = YES;
         }
         else {
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return segmentPauseReceived && segmentPlayReceived;
+        return segmentSeekReceived && segmentPlayReceived;
     }];
     
     [self.mediaPlayerController seekPreciselyToTime:CMTimeAdd(segment.srg_timeRange.start, CMTimeMakeWithSeconds(3., NSEC_PER_SEC)) withCompletionHandler:nil];
@@ -989,62 +1482,73 @@ - (void)testSelectedSegmentAtStreamEnd
     // Precise timing information gathered from the stream itself
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(1795.045, NSEC_PER_SEC), CMTimeMakeWithSeconds(5., NSEC_PER_SEC))];
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"1795");
         return YES;
     }];
     
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     XCTAssertEqualObjects(self.mediaPlayerController.currentSegment, segment);
     XCTAssertEqualObjects(self.mediaPlayerController.selectedSegment, segment);
     
-    // Expect end of segment and play / end for the full-length (which does not harm for statistics)
+    // Expect end of segment and play / eof for the full-length (which does not harm for statistics)
     
-    __block BOOL segmentEndReceived = NO;
+    __block BOOL segmentEofReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
-    __block BOOL fullLengthEndReceived = NO;
+    __block BOOL fullLengthEofReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
-            if (! segmentEndReceived) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"eof"]) {
+            if (! segmentEofReceived) {
                 XCTAssertFalse(fullLengthPlayReceived);
-                XCTAssertFalse(fullLengthEndReceived);
+                XCTAssertFalse(fullLengthEofReceived);
                 
                 XCTAssertEqualObjects(labels[@"stream_name"], @"full");
                 XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
                 XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
-                segmentEndReceived = YES;
+                XCTAssertEqualObjects(labels[@"media_position"], @"1800");
+                segmentEofReceived = YES;
             }
             else {
-                XCTAssertFalse(fullLengthEndReceived);
+                XCTAssertFalse(fullLengthEofReceived);
                 
                 XCTAssertEqualObjects(labels[@"stream_name"], @"full");
                 XCTAssertNil(labels[@"segment_name"]);
                 XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-                fullLengthEndReceived = YES;
+                XCTAssertEqualObjects(labels[@"media_position"], @"1800");
+                fullLengthEofReceived = YES;
             }
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(fullLengthPlayReceived);
-            XCTAssertFalse(fullLengthEndReceived);
+            XCTAssertFalse(fullLengthEofReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+            XCTAssertEqualObjects(labels[@"media_position"], @"1800");
             fullLengthPlayReceived = YES;
         }
         else {
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return segmentEndReceived && fullLengthPlayReceived && fullLengthEndReceived;
+        return segmentEofReceived && fullLengthPlayReceived && fullLengthEofReceived;
     }];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
@@ -1055,27 +1559,47 @@ - (void)testSelectedSegmentAtStreamEnd
 
 - (void)testResetWhilePlayingSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"50");
         return YES;
     }];
     
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Expect end event with segment labels
+    // Play for a while. No stream events must be received
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when playing");
+    }];
+    
+    [self expectationForElapsedTimeInterval:1. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Expect stop event with segment labels
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
+        XCTAssertEqualObjects(labels[@"media_position"], @"51");
         return YES;
     }];
     
@@ -1086,34 +1610,41 @@ - (void)testResetWhilePlayingSegment
 
 - (void)testBlockedSegmentSelection
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertNil(labels[@"segment_name"]);
         XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
         return YES;
     }];
     
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
     Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                        @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Expect pause and play on the full-length (corresponding to the segment being skipped)
+    // Expect seek and play on the full-length (corresponding to the segment being skipped)
     
-    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthSeekReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(fullLengthPauseReceived);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(fullLengthSeekReceived);
             XCTAssertFalse(fullLengthPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-            fullLengthPauseReceived = YES;
+            fullLengthSeekReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(fullLengthPlayReceived);
@@ -1127,7 +1658,7 @@ - (void)testBlockedSegmentSelection
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return fullLengthPauseReceived && fullLengthPlayReceived;
+        return fullLengthSeekReceived && fullLengthPlayReceived;
     }];
     
     [self.mediaPlayerController seekToSegment:segment withCompletionHandler:nil];
@@ -1137,8 +1668,8 @@ - (void)testBlockedSegmentSelection
 
 - (void)testSeekIntoBlockedSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertNil(labels[@"segment_name"]);
         XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
@@ -1146,25 +1677,33 @@ - (void)testSeekIntoBlockedSegment
     }];
     
     Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                        @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Expect pause / play for the full-length
+    // Expect seek / play for the full-length
     
-    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthSeekReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(fullLengthPauseReceived);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(fullLengthSeekReceived);
             XCTAssertFalse(fullLengthPlayReceived);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-            fullLengthPauseReceived = YES;
+            fullLengthSeekReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(fullLengthPlayReceived);
@@ -1178,7 +1717,7 @@ - (void)testSeekIntoBlockedSegment
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return fullLengthPauseReceived && fullLengthPlayReceived;
+        return fullLengthSeekReceived && fullLengthPlayReceived;
     }];
     
     [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(55., NSEC_PER_SEC) withCompletionHandler:nil];
@@ -1188,59 +1727,69 @@ - (void)testSeekIntoBlockedSegment
 
 - (void)testPlayStartingWithBlockedSegment
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
-        XCTAssertNil(labels[@"segment_name"]);
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-        return YES;
-    }];
+    // Expect a play attempt at 50, then a seek / play transition to 60 because of the blocked segment
     
-    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
-    
-    [self waitForExpectationsWithTimeout:20. handler:nil];
-    
-    // Expect pause / play for the full-length
+    __block BOOL fullLengthPlayAt50Received = NO;
+    __block BOOL fullLengthSeekAt50Received = NO;
+    __block BOOL fullLengthPlayAt60Received = NO;
     
-    __block BOOL fullLengthPauseReceived = NO;
-    __block BOOL fullLengthPlayReceived = NO;
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(fullLengthPauseReceived);
-            XCTAssertFalse(fullLengthPlayReceived);
-            
-            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
-            XCTAssertNil(labels[@"segment_name"]);
-            XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-            fullLengthPauseReceived = YES;
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"play"]) {
+            if ([labels[@"media_position"] isEqualToString:@"50"]) {
+                XCTAssertFalse(fullLengthSeekAt50Received);
+                XCTAssertFalse(fullLengthPlayAt60Received);
+                
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertNil(labels[@"segment_name"]);
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+                
+                fullLengthPlayAt50Received = YES;
+            }
+            else if ([labels[@"media_position"] isEqualToString:@"60"]) {
+                XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+                XCTAssertNil(labels[@"segment_name"]);
+                XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
+                
+                fullLengthPlayAt60Received = YES;
+            }
+            else {
+                XCTFail(@"Unexpected event %@", event);
+            }
         }
-        else if ([event isEqualToString:@"play"]) {
-            XCTAssertFalse(fullLengthPlayReceived);
+        else if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(fullLengthPlayAt60Received);
             
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-            fullLengthPlayReceived = YES;
+            
+            fullLengthSeekAt50Received = YES;
         }
         else {
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return fullLengthPauseReceived && fullLengthPlayReceived;
+        return fullLengthPlayAt50Received && fullLengthSeekAt50Received && fullLengthPlayAt60Received;
     }];
     
-    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(55., NSEC_PER_SEC) withCompletionHandler:nil];
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(50., NSEC_PER_SEC), CMTimeMakeWithSeconds(10., NSEC_PER_SEC))];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
 - (void)testBlockedSegmentPlaythrough
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertNil(labels[@"segment_name"]);
         XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
@@ -1248,29 +1797,35 @@ - (void)testBlockedSegmentPlaythrough
     }];
     
     Segment *segment = [Segment blockedSegmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:@[segment] analyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                        @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                 atTime:kCMTimeZero
+                           withSegments:@[segment]
+                        analyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Play for a while. Expect pause / play for the full-length when skipping over the segment
+    // Play for a while. Expect seek / play for the full-length when skipping over the segment
     
-    __block BOOL fullLengthPauseReceived = NO;
+    __block BOOL fullLengthSeekReceived = NO;
     __block BOOL fullLengthPlayReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"pause"]) {
-            XCTAssertFalse(fullLengthPauseReceived);
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(fullLengthSeekReceived);
             XCTAssertFalse(fullLengthPlayReceived);
-            
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
-            fullLengthPauseReceived = YES;
+            fullLengthSeekReceived = YES;
         }
         else if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(fullLengthPlayReceived);
-            
             XCTAssertEqualObjects(labels[@"stream_name"], @"full");
             XCTAssertNil(labels[@"segment_name"]);
             XCTAssertEqualObjects(labels[@"overridable_name"], @"full");
@@ -1280,120 +1835,16 @@ - (void)testBlockedSegmentPlaythrough
             XCTFail(@"Unexpected event %@", event);
         }
         
-        return fullLengthPauseReceived && fullLengthPlayReceived;
-    }];
-    
-    [self waitForExpectationsWithTimeout:20. handler:nil];
-}
-
-- (void)testConsecutiveMediaPlayback
-{
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full1");
-        XCTAssertNil(labels[@"segment_name"]);
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"full1");
-        return YES;
-    }];
-    
-    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:@{ @"stream_name" : @"full1",
-                                                                                                                 @"overridable_name" : @"full1" } userInfo:nil];
-    
-    [self waitForExpectationsWithTimeout:20. handler:nil];
-    
-    // Play other media. Expect end / play transition
-    
-    __block BOOL fullLength1EndReceived = NO;
-    __block BOOL fullLength2PlayReceived = NO;
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
-            XCTAssertFalse(fullLength1EndReceived);
-            XCTAssertFalse(fullLength2PlayReceived);
-            
-            XCTAssertEqualObjects(labels[@"stream_name"], @"full1");
-            XCTAssertNil(labels[@"segment_name"]);
-            XCTAssertEqualObjects(labels[@"overridable_name"], @"full1");
-            fullLength1EndReceived = YES;
-        }
-        else if ([event isEqualToString:@"play"]) {
-            XCTAssertFalse(fullLength2PlayReceived);
-            
-            XCTAssertEqualObjects(labels[@"stream_name"], @"full2");
-            XCTAssertNil(labels[@"segment_name"]);
-            XCTAssertEqualObjects(labels[@"overridable_name"], @"full2");
-            fullLength2PlayReceived = YES;
-        }
-        else {
-            XCTFail(@"Unexpected event %@", event);
-        }
-        
-        return fullLength1EndReceived && fullLength2PlayReceived;
-    }];
-    
-    [self.mediaPlayerController playURL:LiveTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:@{ @"stream_name" : @"full2",
-                                                                                                             @"overridable_name" : @"full2" } userInfo:nil];
-    
-    [self waitForExpectationsWithTimeout:20. handler:nil];
-}
-
-- (void)testConsecutiveMediaWithSegments
-{
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
-        XCTAssertEqualObjects(labels[@"stream_name"], @"full1");
-        XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
-        XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
-        return YES;
-    }];
-    
-    Segment *segment1 = [Segment segmentWithName:@"segment1" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment1] withAnalyticsLabels:@{ @"stream_name" : @"full1",
-                                                                                                                  @"overridable_name" : @"full1" } userInfo:nil];
-    
-    [self waitForExpectationsWithTimeout:20. handler:nil];
-    
-    // Play other media. Expect end / play transition with segment labels involved
-    
-    __block BOOL segment1EndReceived = NO;
-    __block BOOL segment2PlayReceived = NO;
-    
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        if ([event isEqualToString:@"end"]) {
-            XCTAssertFalse(segment1EndReceived);
-            XCTAssertFalse(segment2PlayReceived);
-            
-            XCTAssertEqualObjects(labels[@"stream_name"], @"full1");
-            XCTAssertEqualObjects(labels[@"segment_name"], @"segment1");
-            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment1");
-            segment1EndReceived = YES;
-        }
-        else if ([event isEqualToString:@"play"]) {
-            XCTAssertFalse(segment2PlayReceived);
-            
-            XCTAssertEqualObjects(labels[@"stream_name"], @"full2");
-            XCTAssertEqualObjects(labels[@"segment_name"], @"segment2");
-            XCTAssertEqualObjects(labels[@"overridable_name"], @"segment2");
-            segment2PlayReceived = YES;
-        }
-        else {
-            XCTFail(@"Unexpected event %@", event);
-        }
-        
-        return segment1EndReceived && segment2PlayReceived;
+        return fullLengthSeekReceived && fullLengthPlayReceived;
     }];
     
-    Segment *segment2 = [Segment segmentWithName:@"segment2" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:LiveTestURL() atIndex:0 inSegments:@[segment2] withAnalyticsLabels:@{ @"stream_name" : @"full2",
-                                                                                                              @"overridable_name" : @"full2" } userInfo:nil];
-    
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
 - (void)testDisableTrackingWhileIdle
 {
     // Play for a while. No stream events must be received
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when tracking has been disabled");
     }];
     
@@ -1420,7 +1871,7 @@ - (void)testDisableTrackingWhilePreparing
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Play for a while. No stream events must be received
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when tracking has been disabled");
     }];
     
@@ -1437,7 +1888,7 @@ - (void)testDisableTrackingWhilePreparing
 - (void)testDisableTrackingWhilePlaying
 {
     // Wait until the media plays
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         XCTAssertEqualObjects(event, @"play");
         return YES;
     }];
@@ -1446,9 +1897,9 @@ - (void)testDisableTrackingWhilePlaying
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Stop tracking while playing. Expect an end to be received
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(event, @"end");
+    // Stop tracking while playing. Expect a stop to be received
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"stop");
         return YES;
     }];
     
@@ -1461,8 +1912,8 @@ - (void)testDisableTrackingWhilePlaying
 - (void)testDisableTrackingWhilePlayingSegment
 {
     // Wait until the media plays. Expect segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1470,14 +1921,22 @@ - (void)testDisableTrackingWhilePlayingSegment
     }];
     
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Stop tracking while playing. Expect an end to be received with segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    // Stop tracking while playing. Expect a stop to be received with segment labels
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1493,7 +1952,7 @@ - (void)testDisableTrackingWhilePlayingSegment
 - (void)testDisableTrackingWhilePaused
 {
     // Wait until the media plays
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         XCTAssertEqualObjects(event, @"play");
         return YES;
     }];
@@ -1503,7 +1962,7 @@ - (void)testDisableTrackingWhilePaused
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Pause playback
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         XCTAssertEqualObjects(event, @"pause");
         return YES;
     }];
@@ -1512,9 +1971,9 @@ - (void)testDisableTrackingWhilePaused
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Stop tracking while paused. Expect an end to be received
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(event, @"end");
+    // Stop tracking while paused. Expect a stop to be received
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"stop");
         return YES;
     }];
     
@@ -1524,26 +1983,71 @@ - (void)testDisableTrackingWhilePaused
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
-- (void)testDisableTrackingWhilePausedInSegment
+- (void)testDisableTrackingWhileSeeking
+{
+    // Wait until the media plays
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(event, @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Stop tracking while seeking. Expect a seek and a stop to be received in a row
+    __block BOOL fullLengthSeekReceived = NO;
+    __block BOOL fullLengthStopReceived = NO;
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"seek"]) {
+            XCTAssertFalse(fullLengthStopReceived);
+            fullLengthSeekReceived = YES;
+        }
+        else if ([event isEqualToString:@"stop"]) {
+            fullLengthStopReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthSeekReceived && fullLengthStopReceived;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(20., NSEC_PER_SEC) withCompletionHandler:nil];
+    self.mediaPlayerController.tracked = NO;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
+- (void)testDisableTrackingWhilePausedInSegment
 {
     // Wait until the media plays. Expect segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
         return YES;
     }];
     
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
     // Pause playback. Expect a pause with segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"pause");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1554,9 +2058,9 @@ - (void)testDisableTrackingWhilePausedInSegment
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Stop tracking while paused. Expect an end to be received with segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"end");
+    // Stop tracking while paused. Expect a stop to be received with segment labels
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"stop");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1582,8 +2086,8 @@ - (void)testEnableTrackingWhilePreparing
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Enable tracking. Expect plays to be received
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    // Enable tracking. Expect a play to be received
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         XCTAssertEqualObjects(event, @"play");
         return YES;
     }];
@@ -1604,14 +2108,22 @@ - (void)testEnableTrackingWhilePreparingToPlaySegment
     
     self.mediaPlayerController.tracked = NO;
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Enable tracking. Expect plays to be received
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    // Enable tracking. Expect a play to be received
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1627,7 +2139,7 @@ - (void)testEnableTrackingWhilePreparingToPlaySegment
 - (void)testEnableTrackingWhilePlaying
 {
     // Wait until the player is playing. No event must be received since tracking is not enabled yet
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when tracking has been disabled");
     }];
     
@@ -1643,8 +2155,8 @@ - (void)testEnableTrackingWhilePlaying
     }];
     
     // Enable tracking. Expect a play to be received
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         return YES;
     }];
     
@@ -1657,7 +2169,7 @@ - (void)testEnableTrackingWhilePlaying
 - (void)testEnableTrackingWhilePlayingSegment
 {
     // Wait until the player is playing. No event must be received since tracking is not enabled yet
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when tracking has been disabled");
     }];
     
@@ -1667,16 +2179,24 @@ - (void)testEnableTrackingWhilePlayingSegment
     
     self.mediaPlayerController.tracked = NO;
     Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(2., NSEC_PER_SEC), CMTimeMakeWithSeconds(3., NSEC_PER_SEC))];
-    [self.mediaPlayerController playURL:OnDemandTestURL() atIndex:0 inSegments:@[segment] withAnalyticsLabels:@{ @"stream_name" : @"full",
-                                                                                                                 @"overridable_name" : @"full" } userInfo:nil];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full",
+                           @"overridable_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:labels
+                               userInfo:nil];
     
     [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
         [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
     }];
     
     // Enable tracking. Expect a play to be received, with segment labels
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
-        XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
         XCTAssertEqualObjects(labels[@"stream_name"], @"full");
         XCTAssertEqualObjects(labels[@"segment_name"], @"segment");
         XCTAssertEqualObjects(labels[@"overridable_name"], @"segment");
@@ -1689,10 +2209,54 @@ - (void)testEnableTrackingWhilePlayingSegment
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
+- (void)testEnableTrackingWhileSeeking
+{
+    // Wait until the player is playing. No event must be received since tracking is not enabled yet
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:OnDemandTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Enable tracking right after seeking. Expect a play to be received, and the initial seek reflecting the player state
+    __block BOOL fullLengthPlayReceived = NO;
+    __block BOOL fullLengthSeekReceived = NO;
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        if ([event isEqualToString:@"play"]) {
+            XCTAssertFalse(fullLengthSeekReceived);
+            fullLengthPlayReceived = YES;
+        }
+        else if ([event isEqualToString:@"seek"]) {
+            fullLengthSeekReceived = YES;
+        }
+        else {
+            XCTFail(@"Unexpected event %@", event);
+        }
+        
+        return fullLengthPlayReceived && fullLengthSeekReceived;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeMakeWithSeconds(20., NSEC_PER_SEC) withCompletionHandler:nil];
+    self.mediaPlayerController.tracked = YES;
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+}
+
 - (void)testEnableTrackingWhilePaused
 {
     // Wait until the player is playing. No event must be received since tracking is not enabled yet
-    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         XCTFail(@"No event must be received when tracking has been disabled");
     }];
     
@@ -1725,7 +2289,7 @@ - (void)testEnableTrackingWhilePaused
     __block BOOL playReceived = NO;
     __block BOOL pauseReceived = NO;
     
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         if ([event isEqualToString:@"play"]) {
             XCTAssertFalse(playReceived);
             XCTAssertFalse(pauseReceived);
@@ -1748,10 +2312,10 @@ - (void)testEnableTrackingWhilePaused
     [self waitForExpectationsWithTimeout:20. handler:nil];
 }
 
-- (void)testDisableTrackingWhilePlayingTwice
+- (void)testDisableTrackingTwiceWhilePlaying
 {
     // Wait until the media plays
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
         XCTAssertEqualObjects(event, @"play");
         return YES;
     }];
@@ -1760,11 +2324,11 @@ - (void)testDisableTrackingWhilePlayingTwice
     
     [self waitForExpectationsWithTimeout:20. handler:nil];
     
-    // Stop tracking twice while playing. Expect a single end to be received
-    __block NSInteger endEventCount = 0;
-    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
-        if ([event isEqualToString:@"end"]) {
-            ++endEventCount;
+    // Stop tracking twice while playing. Expect a single stop to be received
+    __block NSInteger stopEventCount = 0;
+    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"stop"]) {
+            ++stopEventCount;
         }
         else {
             XCTFail(@"Unexpected event received");
@@ -1781,11 +2345,11 @@ - (void)testDisableTrackingWhilePlayingTwice
         [[NSNotificationCenter defaultCenter] removeObserver:endEventObserver];
     }];
     
-    // Check we have received the end notification only once
-    XCTAssertEqual(endEventCount, 1);
+    // Check we have received the stop notification only once
+    XCTAssertEqual(stopEventCount, 1);
 }
 
-- (void)testEnableTrackingWhilePlayingTwice
+- (void)testEnableTrackingTwiceWhilePlaying
 {
     // Wait until the media plays
     [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
@@ -1799,7 +2363,7 @@ - (void)testEnableTrackingWhilePlayingTwice
     
     // Start tracking twice while playing. Expect a single play to be received
     __block NSInteger playEventCount = 0;
-    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+    id endEventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
         if ([event isEqualToString:@"play"]) {
             ++playEventCount;
         }
@@ -1818,8 +2382,405 @@ - (void)testEnableTrackingWhilePlayingTwice
         [[NSNotificationCenter defaultCenter] removeObserver:endEventObserver];
     }];
     
-    // Check we have received the end notification only once
+    // Check we have received the play notification only once
     XCTAssertEqual(playEventCount, 1);
 }
 
+- (void)testOnDemandHeartbeatPlayPausePlay
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:OnDemandTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:labels userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount = 0;
+    id heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTFail(@"No uptime expected for on-demand streams");
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 2);
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"pause");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController pause];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    heartbeatCount = 0;
+    heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTFail(@"No uptime expected for on-demand streams");
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:4. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 0);
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController play];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    heartbeatCount = 0;
+    heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTFail(@"No uptime expected for on-demand streams");
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 2);
+}
+
+- (void)testLivestreamHeartbeatPlay
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        XCTAssertEqualObjects(labels[@"media_position"], @"0");
+        XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:LiveTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:labels userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount = 0;
+    __block NSInteger liveHeartbeatCount = 0;
+    id heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertTrue(([labels[@"media_position"] integerValue] % 3) == 0);
+            XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            XCTAssertTrue(([labels[@"media_position"] integerValue] % 6) == 0);
+            XCTAssertEqualObjects(labels[@"media_timeshift"], @"0");
+            ++liveHeartbeatCount;
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:14. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 4);
+    XCTAssertEqual(liveHeartbeatCount, 2);
+}
+
+- (void)testHeartbeatWithSegmentPlayback
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        return YES;
+    }];
+    
+    Segment *segment = [Segment segmentWithName:@"segment" timeRange:CMTimeRangeMake(CMTimeMakeWithSeconds(4., NSEC_PER_SEC), CMTimeMakeWithSeconds(4., NSEC_PER_SEC))];
+    [self.mediaPlayerController playURL:OnDemandTestURL()
+                                atIndex:0
+                             inSegments:@[segment]
+                    withAnalyticsLabels:nil
+                               userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount = 0;
+    __block NSInteger segmentHeartbeatCount = 0;
+    id heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            if ([labels[@"segment_name"] isEqualToString:@"segment"]) {
+                ++segmentHeartbeatCount;
+            }
+            else {
+                ++heartbeatCount;
+            }
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:14. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 3);
+    XCTAssertEqual(segmentHeartbeatCount, 1);
+}
+
+- (void)testDVRLiveHeartbeats
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:DVRTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:labels userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount = 0;
+    __block NSInteger liveHeartbeatCount = 0;
+    id heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++liveHeartbeatCount;
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:14. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 4);
+    XCTAssertEqual(liveHeartbeatCount, 2);
+}
+
+- (void)testDVRTimeshiftHeartbeats
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+        return YES;
+    }];
+    
+    SRGAnalyticsStreamLabels *labels = [[SRGAnalyticsStreamLabels alloc] init];
+    labels.customInfo = @{ @"stream_name" : @"full" };
+    
+    [self.mediaPlayerController playURL:DVRTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:labels userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // Seek to the past
+    
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        return [labels[@"event_id"] isEqualToString:@"play"];
+    }];
+    
+    [self.mediaPlayerController seekPreciselyToTime:CMTimeSubtract(CMTimeRangeGetEnd(self.mediaPlayerController.timeRange), CMTimeMakeWithSeconds(60., NSEC_PER_SEC)) withCompletionHandler:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount = 0;
+    __block NSInteger liveHeartbeatCount = 0;
+    id heartbeatEventObserver = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++heartbeatCount;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            XCTAssertEqualObjects(labels[@"stream_name"], @"full");
+            ++liveHeartbeatCount;
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:14. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver];
+    }];
+    
+    XCTAssertEqual(heartbeatCount, 4);
+    XCTAssertEqual(liveHeartbeatCount, 0);
+}
+
+- (void)testHeartbeatAfterDisablingTracking
+{
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        return YES;
+    }];
+    
+    [self.mediaPlayerController playURL:LiveTestURL() atTime:kCMTimeZero withSegments:nil analyticsLabels:nil userInfo:nil];
+    
+    [self waitForExpectationsWithTimeout:20. handler:nil];
+    
+    // For tests, heartbeat interval is set to 3 seconds.
+    
+    __block NSInteger heartbeatCount1 = 0;
+    __block NSInteger liveHeartbeatCount1 = 0;
+    id heartbeatEventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            ++heartbeatCount1;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            ++liveHeartbeatCount1;
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver1];
+    }];
+    
+    XCTAssertEqual(heartbeatCount1, 2);
+    XCTAssertEqual(liveHeartbeatCount1, 1);
+    
+    // Disable tracking. No heartbeats must be received anymore
+    self.mediaPlayerController.tracked = NO;
+    
+    __block NSInteger heartbeatCount2 = 0;
+    __block NSInteger liveHeartbeatCount2 = 0;
+    id heartbeatEventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            ++heartbeatCount2;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            ++liveHeartbeatCount2;
+        }
+    }];
+    
+    // Wait a little bit to collect potential events
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver2];
+    }];
+    
+    XCTAssertEqual(heartbeatCount2, 0);
+    XCTAssertEqual(liveHeartbeatCount2, 0);
+}
+
+- (void)testHeartbeatAfterEnablingTracking
+{
+    // Wait until the player is playing. No event must be received since tracking is not enabled yet
+    id eventObserver = [[NSNotificationCenter defaultCenter] addObserverForPlayerSingleHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        XCTFail(@"No event must be received when tracking has been disabled");
+    }];
+    
+    [self expectationForNotification:SRGMediaPlayerPlaybackStateDidChangeNotification object:self.mediaPlayerController handler:^BOOL(NSNotification * _Nonnull notification) {
+        return [notification.userInfo[SRGMediaPlayerPlaybackStateKey] integerValue] == SRGMediaPlayerPlaybackStatePlaying;
+    }];
+    
+    self.mediaPlayerController.tracked = NO;
+    [self.mediaPlayerController playURL:LiveTestURL()];
+    
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];
+    }];
+    
+    // Play a little bit. No heartbeats must be received
+    __block NSInteger heartbeatCount1 = 0;
+    __block NSInteger liveHeartbeatCount1 = 0;
+    id heartbeatEventObserver1 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            ++heartbeatCount1;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            ++liveHeartbeatCount1;
+        }
+    }];
+    
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver1];
+    }];
+    
+    XCTAssertEqual(heartbeatCount1, 0);
+    XCTAssertEqual(liveHeartbeatCount1, 0);
+    
+    // Enable tracking. Expect a play to be received
+    [self expectationForHiddenPlaybackEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"play");
+        return YES;
+    }];
+    
+    XCTAssertEqual(self.mediaPlayerController.playbackState, SRGMediaPlayerPlaybackStatePlaying);
+    self.mediaPlayerController.tracked = YES;
+    
+    // Heartbeats are now expected to be received
+    
+    __block NSInteger heartbeatCount2 = 0;
+    __block NSInteger liveHeartbeatCount2 = 0;
+    id heartbeatEventObserver2 = [[NSNotificationCenter defaultCenter] addObserverForHiddenEventNotificationUsingBlock:^(NSString * _Nonnull event, NSDictionary * _Nonnull labels) {
+        if ([event isEqualToString:@"pos"]) {
+            ++heartbeatCount2;
+        }
+        else if ([event isEqualToString:@"uptime"]) {
+            ++liveHeartbeatCount2;
+        }
+    }];
+    
+    [self expectationForElapsedTimeInterval:7. withHandler:nil];
+    [self waitForExpectationsWithTimeout:20. handler:^(NSError * _Nullable error) {
+        [[NSNotificationCenter defaultCenter] removeObserver:heartbeatEventObserver2];
+    }];
+    
+    XCTAssertEqual(heartbeatCount2, 2);
+    XCTAssertEqual(liveHeartbeatCount2, 1);
+}
+
 @end
diff --git a/Tests/Sources/TrackerTestCase.m b/Tests/Sources/TrackerTestCase.m
index 4a5bb239..fbe984f8 100644
--- a/Tests/Sources/TrackerTestCase.m
+++ b/Tests/Sources/TrackerTestCase.m
@@ -7,7 +7,7 @@
 #import "AnalyticsTestCase.h"
 #import "NSNotificationCenter+Tests.h"
 
-typedef BOOL (^EventExpectationHandler)(NSString *type, NSDictionary *labels);
+typedef BOOL (^EventExpectationHandler)(NSString *event, NSDictionary *labels);
 
 @interface TrackerTestCase : AnalyticsTestCase
 
@@ -19,31 +19,36 @@ @implementation TrackerTestCase
 
 - (void)testHiddenEvent
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertNil(type);
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Hidden event");
-        XCTAssertEqualObjects(labels[@"name"], @"app.hidden-event");
-        XCTAssertEqualObjects(labels[@"category"], @"app");
+    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"hidden_event");
+        XCTAssertEqualObjects(labels[@"event_name"], @"Hidden event");
         return YES;
     }];
     
-    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithTitle:@"Hidden event"];
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"Hidden event"];
     
     [self waitForExpectationsWithTimeout:5. handler:nil];
 }
 
-- (void)testHiddenEventWithCustomLabels
+- (void)testHiddenEventWithLabels
 {
-    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *type, NSDictionary *labels) {
-        XCTAssertNil(type);
-        XCTAssertEqualObjects(labels[@"srg_title"], @"Hidden event");
-        XCTAssertEqualObjects(labels[@"name"], @"app.hidden-event");
-        XCTAssertEqualObjects(labels[@"category"], @"app");
+    [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
+        XCTAssertEqualObjects(labels[@"event_id"], @"hidden_event");
+        XCTAssertEqualObjects(labels[@"event_name"], @"Hidden event");
+        XCTAssertEqualObjects(labels[@"event_type"], @"toggle");
+        XCTAssertEqualObjects(labels[@"event_source"], @"favorite_list");
+        XCTAssertEqualObjects(labels[@"event_value"], @"true");
         XCTAssertEqualObjects(labels[@"custom_label"], @"custom_value");
         return YES;
     }];
     
-    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithTitle:@"Hidden event" customLabels:@{ @"custom_label" : @"custom_value" }];
+    SRGAnalyticsHiddenEventLabels *labels = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels.type = @"toggle";
+    labels.source = @"favorite_list";
+    labels.value = @"true";
+    labels.customInfo = @{ @"custom_label" : @"custom_value" };
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"Hidden event"
+                                                           labels:labels];
     
     [self waitForExpectationsWithTimeout:5. handler:nil];
 }
@@ -56,7 +61,7 @@ - (void)testHiddenEventWithEmptyTitle
     
     [self expectationForElapsedTimeInterval:5. withHandler:nil];
     
-    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithTitle:@"" customLabels:nil];
+    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@""];
     
     [self waitForExpectationsWithTimeout:5. handler:^(NSError * _Nullable error) {
         [[NSNotificationCenter defaultCenter] removeObserver:eventObserver];