diff --git a/.changeset/lemon-spoons-boil.md b/.changeset/lemon-spoons-boil.md
new file mode 100644
index 00000000..d53e727b
--- /dev/null
+++ b/.changeset/lemon-spoons-boil.md
@@ -0,0 +1,5 @@
+---
+"@theoplayer/comscore-connector-web": patch
+---
+
+Fixed multiple issues where the timing of reporting the DVR window length and the playhead's offset wrt the DVR window end was wrong if a LIVE stream with a CSAI pre-roll was set as the player source.
diff --git a/.changeset/odd-scissors-rule.md b/.changeset/odd-scissors-rule.md
new file mode 100644
index 00000000..89e8253d
--- /dev/null
+++ b/.changeset/odd-scissors-rule.md
@@ -0,0 +1,5 @@
+---
+"@theoplayer/comscore-connector-web": patch
+---
+
+Initial release to npm.
diff --git a/README.md b/README.md
index 3b0fa6e2..8ef22b61 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Using the available connectors allows you to augment the features delivered thro
 | Connector | npm package                                                                                                                                                                                                         | Source code                                                               |
 |:----------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------|
 | CMCD      | [![@theoplayer/cmcd-connector-web](https://img.shields.io/npm/v/%40theoplayer%2Fcmcd-connector-web?label=%40theoplayer%2Fcmcd-connector-web)](https://npmjs.com/package/@theoplayer/cmcd-connector-web)             | [cmcd](https://github.com/THEOplayer/web-connectors/tree/main/cmcd)       |
+| Comscore  | [![@theoplayer/comscore-connector-web](https://img.shields.io/npm/v/%40theoplayer%2Fcomscore-connector-web?label=%40theoplayer%2Fcomscore-connector-web)](https://npmjs.com/package/@theoplayer/comscore-connector-web)         | [comscore](https://github.com/THEOplayer/web-connectors/tree/main/comscore)       |
 | Conviva   | [![@theoplayer/conviva-connector-web](https://img.shields.io/npm/v/%40theoplayer%2Fconviva-connector-web?label=%40theoplayer%2Fconviva-connector-web)](https://npmjs.com/package/@theoplayer/conviva-connector-web) | [conviva](https://github.com/THEOplayer/web-connectors/tree/main/conviva) |
 | Nielsen   | [![@theoplayer/nielsen-connector-web](https://img.shields.io/npm/v/%40theoplayer%2Fnielsen-connector-web?label=%40theoplayer%2Fnielsen-connector-web)](https://npmjs.com/package/@theoplayer/nielsen-connector-web) | [nielsen](https://github.com/THEOplayer/web-connectors/tree/main/nielsen) |
 | Yospace   | [![@theoplayer/yospace-connector-web](https://img.shields.io/npm/v/%40theoplayer%2Fyospace-connector-web?label=%40theoplayer%2Fyospace-connector-web)](https://npmjs.com/package/@theoplayer/yospace-connector-web) | [yospace](https://github.com/THEOplayer/web-connectors/tree/main/yospace) |
diff --git a/cmcd/package.json b/cmcd/package.json
index 9da990b5..b7e76e98 100644
--- a/cmcd/package.json
+++ b/cmcd/package.json
@@ -8,6 +8,9 @@
     "url": "git+https://github.com/THEOplayer/web-connectors.git",
     "directory": "cmcd"
   },
+  "bugs": {
+    "url": "https://github.com/THEOplayer/web-connectors/issues"
+  },
   "homepage": "https://theoplayer.com/",
   "module": "dist/cmcd-connector.esm.js",
   "types": "dist/types/index.d.ts",
diff --git a/comscore/.gitignore b/comscore/.gitignore
new file mode 100644
index 00000000..92b3d00f
--- /dev/null
+++ b/comscore/.gitignore
@@ -0,0 +1,10 @@
+# Node artifact files
+node_modules/
+lib/
+dist/
+
+# Generated by MacOS
+.DS_Store
+
+# Generated by Windows
+Thumbs.db
diff --git a/comscore/CHANGELOG.md b/comscore/CHANGELOG.md
new file mode 100644
index 00000000..f037a0d7
--- /dev/null
+++ b/comscore/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @theoplayer/comscore-connector-web
+
+## 1.0.21
+
+### ✨ Features
+
+-   Initial release as a connector
diff --git a/comscore/README.md b/comscore/README.md
new file mode 100644
index 00000000..773e446b
--- /dev/null
+++ b/comscore/README.md
@@ -0,0 +1,110 @@
+# comscore-connector-web
+
+The Comscore connector provides a Comscore integration for THEOplayer.
+
+## Installation
+
+```sh
+npm install @theoplayer/comscore-connector-web
+```
+
+This connector depends on the JavaScript ComScore SDK, which should be loaded and available in the global scope before the connector. Get it from your ComScore dashboard or talk to a ComScore representative. This connector was developed and tested with versions 7.2.0.200214 and 7.6.1.210506
+
+```html
+<script src="/path/to/comscore.js">
+```
+
+## Usage
+
+### Configuring the connector
+
+Create the connector by providing the `THEOplayer` instance, a ComscoreConfiguration (which contains your publisher id, also referred to as the c2 value) and the ComscoreMetadata of the first source being set to the player. You can change the metadata dynamically throughout the lifecycle of the connector.
+
+```js
+import { ComscoreConnector } from '../../dist/comscore-connector.esm.js';
+
+const comscoreConfig = {
+    publisherId: '<your publisher id>',
+    applicationName: 'Test App',
+    userConsent: '1',
+    debug: true
+};
+
+const comscoreMetadata = {
+    mediaType: 'longFormOnDemand',
+    uniqueId: 'testuniqueId',
+    length: 634566, // in milliseconds
+    stationTitle: 'THEOTV',
+    programTitle: 'Big Buck Bunny',
+    episodeTitle: 'Intro',
+    genreName: 'Animation',
+    classifyAsAudioStream: false,
+    customLabels: {
+        testcustomlabel: 'testcustomvalue'
+    }
+};
+
+const comscoreConnector = new ComscoreConnector(player, comscoreConfig, comscoreMetadata);
+```
+
+### Passing metadata dynamically
+
+The connector allows updating the current asset's metadata at any time. Do it when setting a new source to the player.
+
+```js
+comscoreConnector.updateMetadata(newMetadata);
+```
+
+### ComscoreMetadata fields
+
+Based on the `ComscoreMetadata` type, you can tell which fields are mandatory and which aren't. Note that this is purely for the integration to work correctly. Depending on the Comscore solution you are using, different fields are required/optional. The mandatory fields in the `ComscoreMetadata` type are the ones that are mandatory for all three Comscore solutions:
+
+-   Video Metrix (V)
+-   Cross Platform Product Suite (X)
+-   Cross Media Audience Measurement (C)
+
+| Property                           | Required | Optional |
+| ---------------------------------- | :------: | :------: |
+| `mediaType`                        |   All    |          |
+| `uniqueId`                         |   All    |          |
+| `length`                           |   All    |          |
+| `c3?`                              |    V     |          |
+| `c4?`                              |    V     |          |
+| `c6?`                              |    V     |          |
+| `stationTitle`                     |   All    |          |
+| `stationCode?`                     |          |   All    |
+| `networkAffiliate?`                |          |   All    |
+| `publisherName?`                   |   X C    |    V     |
+| `programTitle`                     |   All    |          |
+| `programId?`                       |          |   V C    |
+| `episodeTitle`                     |   All    |          |
+| `episodeId?`                       |          |   X C    |
+| `episodeSeasonNumber?`             |   X C    |          |
+| `episodeNumber?`                   |   X C    |          |
+| `genreName`                        |   All    |          |
+| `genreId?`                         |          |   All    |
+| `carryTvAdvertisementLoad?`        |    X     |          |
+| `classifyAsCompleteEpisode?`       |    X     |          |
+| `dateOfProduction?`                |          |    C     |
+| `timeOfProduction?`                |          |    C     |
+| `dateOfTvAiring?`                  |   X C    |          |
+| `timeOfTvAiring?`                  |          |   X C    |
+| `dateOfDigitalAiring?`             |   X C    |          |
+| `timeOfDigitalAiring?`             |          |   X C    |
+| `feedType?`                        |    X     |          |
+| `classifyAsAudioStream`            |    Al    |          |
+| `deliveryMode?`                    |          |   All    |
+| `deliverySubscriptionType?`        |          |   All    |
+| `deliveryComposition?`             |          |   All    |
+| `deliveryAdvertisementCapability?` |          |   All    |
+| `mediaFormat?`                     |          |   All    |
+| `distributionModel?`               |          |   All    |
+| `playlistTitle?`                   |          |    C     |
+| `totalSegments?`                   |          |   V C    |
+| `clipUrl?`                         |          |   V C    |
+| `videoDimension?`                  |          |    C     |
+| `customLabels?`                    |          |   All    |
+
+## Documentation
+
+The integration guidelines from ComScore can be found on their [Unified Digital Measurements page](https://www.comscore.com/Products/Digital/Unified-Digital-Measurement-Enhanced) in the Tagging section.
diff --git a/comscore/package.json b/comscore/package.json
new file mode 100644
index 00000000..2b84dba5
--- /dev/null
+++ b/comscore/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@theoplayer/comscore-connector-web",
+  "version": "1.0.20",
+  "description": "A connector implementing Comscore with THEOplayer",
+  "main": "dist/comscore-connector.umd.js",
+  "module": "dist/comscore-connector.esm.js",
+  "types": "dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/types/index.d.ts",
+      "import": "./dist/comscore-connector.esm.js",
+      "require": "./dist/comscore-connector.umd.js"
+    },
+    "./dist/*": "./dist/*",
+    "./package": "./package.json",
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf lib dist",
+    "bundle": "rollup -c rollup.config.mjs",
+    "build": "npm run clean && npm run bundle",
+    "serve": "http-server ./.. -o /comscore/test/pages/main.html",
+    "test": "echo \"No tests yet\""
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/THEOplayer/web-connectors.git",
+    "directory": "comscore"
+  },
+  "author": "THEO Technologies NV",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/THEOplayer/web-connectors/issues"
+  },
+  "homepage": "https://github.com/THEOplayer/web-connectors#readme",
+  "peerDependencies": {
+    "theoplayer": "^7.0.0"
+  }
+}
diff --git a/comscore/rollup.config.mjs b/comscore/rollup.config.mjs
new file mode 100644
index 00000000..d728f46b
--- /dev/null
+++ b/comscore/rollup.config.mjs
@@ -0,0 +1,15 @@
+import fs from "node:fs";
+import {getSharedBuildConfiguration} from "../tools/build.mjs";
+
+
+const {version} = JSON.parse(fs.readFileSync("./package.json", "utf8"));
+
+const fileName = "comscore-connector";
+const globalName = "THEOplayerComscoreConnector";
+
+const banner = `
+/**
+ * THEOplayer Comscore Web Connector v${version}
+ */`.trim();
+
+export default getSharedBuildConfiguration({fileName, globalName, banner});
diff --git a/comscore/src/api/ComscoreConfiguration.ts b/comscore/src/api/ComscoreConfiguration.ts
new file mode 100644
index 00000000..9d06e5a6
--- /dev/null
+++ b/comscore/src/api/ComscoreConfiguration.ts
@@ -0,0 +1,31 @@
+import { Ad } from "theoplayer";
+
+export enum ComscoreUserConsent {
+    denied = "0",
+    granted = "1",
+    unknown = ""
+}
+
+export enum ComscoreUsagePropertiesAutoUpdateMode {
+    foregroundOnly = "foregroundOnly",
+    foregroundAndBackground = "foregroundAndBackground",
+    disabled = "disabled"
+}
+
+export interface ComscoreConfiguration {
+    /**
+     * Also known as the c2 value
+     */
+    publisherId: string;
+    applicationName: string;
+    userConsent: ComscoreUserConsent;
+    /**
+     * Defaults to foregroundOnly if none is specified. If your app has some background experience, use foregroundAndBackground.
+     */
+    usagePropertiesAutoUpdateMode?: ComscoreUsagePropertiesAutoUpdateMode;
+    skeleton?: any;
+    adIdProcessor?: (ad: Ad) => string;
+    debug?: boolean;
+}
+
+
diff --git a/comscore/src/api/ComscoreConnector.ts b/comscore/src/api/ComscoreConnector.ts
new file mode 100644
index 00000000..a79338f1
--- /dev/null
+++ b/comscore/src/api/ComscoreConnector.ts
@@ -0,0 +1,99 @@
+import { ChromelessPlayer } from 'theoplayer';
+import type { ComscoreConfiguration, ComscoreUserConsent } from './ComscoreConfiguration';
+import type { ComscoreMetadata } from './ComscoreMetadata';
+import { ComscoreStreamingAnalyticsTHEOIntegration } from '../integration/ComscoreStreamingAnalyticsTHEOIntegration';
+
+const USER_CONSENT_LABEL = "cs_ucfr"
+
+export class ComscoreConnector {
+
+    private analytics = ns_.analytics
+    private configuration: ComscoreConfiguration
+    private streamingAnalyticsIntegration: ComscoreStreamingAnalyticsTHEOIntegration
+
+    /**
+     * Constructor for the THEOplayer Comscore connector
+     * @param player a THEOplayer instance reference
+     * @param comscoreConfig configuration object that should at least hold the publisher id, application name and an initial user consent value
+     * @param comscoreMetadata metadata associated with the SourceDescription that is or will be passed to the THEOplayer instance
+     * @returns 
+     */
+    constructor(player: ChromelessPlayer, comscoreConfig: ComscoreConfiguration, comscoreMetadata: ComscoreMetadata) {
+        if (typeof ns_ === 'undefined' || typeof this.analytics === 'undefined') {
+            throw new Error('[COMSCORE] ComScore script missing, cannot init ComScoreAnalytics');
+        }
+
+        this.configuration = comscoreConfig
+
+        // Set platform API
+        if (this.configuration.skeleton) {
+            this.analytics.PlatformApi.setPlatformAPI(this.analytics.PlatformAPIs.Skeleton, this.configuration.skeleton)
+        } else {
+            this.analytics.PlatformApi.setPlatformAPI(this.analytics.PlatformAPIs.html5)
+        }
+
+        // Configure publisher
+        const publisherConfiguration = new this.analytics.configuration.PublisherConfiguration({
+            publisherId: comscoreConfig.publisherId,
+            persistentLabels: {
+                [USER_CONSENT_LABEL]: comscoreConfig.userConsent || ""
+            }
+        })
+        this.analytics.configuration.addClient(publisherConfiguration)
+        this.analytics.configuration.setApplicationName(comscoreConfig.applicationName)
+        
+
+        // Start application tracking
+        this.analytics.start()
+
+        // Set Streaming Analytics integration
+        this.streamingAnalyticsIntegration = new ComscoreStreamingAnalyticsTHEOIntegration(player, comscoreConfig, comscoreMetadata);
+    }
+
+    /**
+     * Sets/updates Comscore metadata on the Comscore video analytics.
+     * @param metadata object of key value pairs
+     */
+    update(metadata: ComscoreMetadata): void {
+        this.streamingAnalyticsIntegration.update(metadata);
+    }
+
+    /**
+     *  Update the user consent 
+     * @param consentValue `"1"` indicates consent was granted, `"0"` not granted and `""` unknown.
+     */
+    updateUserConsent(consentValue: ComscoreUserConsent): void {
+        this.analytics.configuration
+            .getPublisherConfiguration(this.configuration.publisherId)
+            .setPersistentLabel(USER_CONSENT_LABEL, consentValue);
+        this.analytics.notifyHiddenEvent()
+    }
+
+    /**
+     * Set persistent label on the ComScore PublisherConfiguration
+     * @param label
+     * @param value
+     */
+    setPersistentLabel(label: string, value: string): void {
+        this.analytics.configuration
+            .getPublisherConfiguration(this.configuration.publisherId)
+            .setPersistentLabel(label,value);
+        }
+
+    /**
+     * Set persistent labels on the ComScore PublisherConfiguration
+     * @param labels object of key value pairs
+     */
+    setPersistentLabels(labels: { [key: string]: string }): void {
+        this.analytics.configuration
+            .getPublisherConfiguration(this.configuration.publisherId)
+            .setPersistentLabels(labels);
+    }
+
+    /**
+     * Destroy ComScoreStreamingAnalytics and unregister it from player
+     */
+    destroy(): void {
+        this.streamingAnalyticsIntegration.destroy();
+    }
+}
\ No newline at end of file
diff --git a/comscore/src/api/ComscoreMetadata.ts b/comscore/src/api/ComscoreMetadata.ts
new file mode 100644
index 00000000..c52e4ed7
--- /dev/null
+++ b/comscore/src/api/ComscoreMetadata.ts
@@ -0,0 +1,252 @@
+export type CustomComscoreMetadata = {
+    [id: string]: string;
+}
+
+export enum ComscoreMediaType {
+    longFormOnDemand = "longFormOnDemand",
+    shortFormOnDemand = "shortFormOnDemand",
+    live = "live",
+    userGeneratedLongFormOnDemand = "userGeneratedLongFormOnDemand",
+    userGeneratedShortFormOnDemand = "userGeneratedShortFormOnDemand",
+    userGeneratedLive = "userGeneratedLive",
+    bumper = "bumper",
+    other = "other"
+}
+
+export enum ComscoreFeedType {
+    eastHD = "easthd",
+    westHD = "westhd",
+    eastSD = "eastsd",
+    westSD = "westsd"
+}
+
+export enum ComscoreDeliveryMode {
+    linear = "linear",
+    ondemand = "ondemand"
+}
+
+export enum ComscoreDeliverySubscriptionType {
+    traditionalMvpd = "traditionalMvpd",  // LIVE
+    virtualMvpd = "virtualMvpd",          // LIVE
+    subscription = "subscription",
+    transactional = "transactional",
+    advertising = "advertising",
+    premium = "premium"
+}
+
+export enum ComscoreDeliveryComposition {
+    clean = "clean",
+    embed = "embed"
+}
+
+export enum ComscoreDeliveryAdvertisementCapability {
+    none = "none",
+    dynamicLoad = "dynamicLoad",
+    dynamicReplacement = "dynamicReplacement",
+    linear1day = "linear1day",
+    linear2day = "linear2day",
+    linear3day = "linear3day",
+    linear4day = "linear4day",
+    linear5day = "linear5day",
+    linear6day = "linear6day",
+    linear7day = "linear7day"
+}
+
+export enum ComscoreMediaFormat {
+    fullContentEpisode = "fullContentEpisode",
+    fullContentMovie = "fullContentMovie",
+    fullContentPodcast = "fullContentPodcast",
+    fullContentGeneric = "fullContentGeneric",
+    partialContentEpisode = "partialContentEpisode",
+    partialContentMovie = "partialContentMovie",
+    partialContentPodcast = "partialContentPodcast",
+    partialContentGeneric = "partialContentGeneric",
+    previewEpisode = "previewEpisode",
+    previewMovie = "previewMovie",
+    previewGeneric = "previewGeneric",
+    extraEpisode = "extraEpisode",
+    extraMovie = "extraMovie",
+    extraGeneric = "extraGeneric"
+}
+
+export enum ComscoreDistributionModel {
+    tvAndOnline = "tvAndOnline",
+    exclusivelyOnline = "exclusivelyOnline"
+}
+
+export type ComscoreDate = {
+    day: number;
+    month: number;
+    year: number;
+}
+
+export type ComscoreTime = {
+    hours: number;
+    minutes: number;
+}
+
+export type ComscoreDimension = {
+    width: number;
+    height: number;
+}
+
+export interface ComscoreMetadata {
+    /**
+     * Classification type, mandatory, setMediaType( value ) - (ns_st_li)
+     */
+    mediaType: ComscoreMediaType;
+    /**
+     * Program ID for VMX, unique identifier for the content, LIVE: Mandatory, VOD: Mandatory, Adv: Inherited from Content, Comscore API: setUniqueId( string id ) - (ns_st_ct)
+     */
+    uniqueId: string;
+    /**
+     * Clip Length in milliseconds, Comscore API: setLength( int length ) - (ns_st_cl)
+     */
+    length: number;
+    /**
+     * VMX dictionary (level 1), mandatory, Comscore API: setDictionaryClassificationC3( string value ) - (c3)
+     */
+    c3?: string;
+    /**
+     * VMX dictionary (level 2), mandatory, Comscore API: setDictionaryClassificationC4( string value ) - (c4)
+     */
+    c4?: string;
+    /**
+     * VMX dictionary (level 3), mandatory, Comscore API: setDictionaryClassificationC6( string value ) - (c6)
+     */
+    c6?: string;
+    /**
+     * Channel Name, title of the station or channel for which content was recorded or where content is made available, LIVE: Mandatory,VOD: Mandatory,Adv: Inherited from Content, Comscore API: setStationTitle( string title ) - (ns_st_st)
+     */
+    stationTitle: string;
+    /**
+     * Channel ID, Code of the station or channel for which content was recorded or where content is made available, LIVE: Mandatory,VOD: Mandatory,Adv: Inherited from Content, Comscore API: setStationCode( string code ) - (ns_st_stc)
+     */
+    stationCode?: string;
+    /**
+     * Code to identify station affiliation in cases where the same local TV station call sign is affiliated with multiple national TV networks, Comscore API: setNetworkAffiliate( string code ) - (ns_st_sta)
+     */
+    networkAffiliate?: string;
+    /**
+     * Publisher Brand Name, the consumer-facing brand name of the media publisher that owns the content, LIVE: Mandatory, VOD: Mandatory, Adv: Inherited from Content, Comscore API: setPublisherName( string name ) - (ns_st_pu)
+     */
+    publisherName?: string;
+    /**
+     * Program name, Top level content title (i.e., the name of the overall program, show, or content series), LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setProgramTitle( string title ) - (ns_st_pr)
+     */
+    programTitle: string;
+    /**
+     * Program Id, Top level content ID to be used for matching and grouping purposes, LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setProgramId( string id ) - (ns_st_tpr)
+     */
+    programId?: string;
+    /**
+     * Episode title, Sub level content title (i.e., the title of the specific episode),LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setEpisodeTitle( string title ) - (ns_st_ep)
+     */
+    episodeTitle: string;
+    /**
+     * Episode ID Sub level content ID to be used for matching and grouping purposes,LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setEpisodeId( string id ) - (ns_st_tep)
+     */
+    episodeId?: string;
+    /**
+     * Season Number, Season number for episodic content, LIVE: Optional, VOD: Optional, Adv: Inherited from Content, Comscore API: setEpisodeSeasonNumber( string value ) - (ns_st_sn)
+     */
+    episodeSeasonNumber?: string;
+    /**
+     * Episode number for episodic content. It is recommended to use values with 2 digits — or 3 digits for episodic content with more than 99 episodes in a season — left-padded with 0, Comscore API: setEpisodeNumber( string value ) - (ns_st_en)
+     */
+    episodeNumber?: string;
+    /**
+     * Genre description. Multiple values can be provided as a comma-separated string, LIVE: Optional, VOD: Optional, Adv: Inherited from Content, Comscore API: setGenreName( string name ) - (ns_st_ge)
+     */
+    genreName: string;
+    /**
+     * Genre ID to be used for matching and grouping purposes (for example when the genres are multilingual). Multiple values can be provided as a comma-separated string, Comscore API: setGenreId( string id ) - (ns_st_tge)
+     */
+    genreId?: string;
+    /**
+     * This metadata helps Comscore differentiate if the stream is carrying the same ad load as TV, Comscore API: carryTvAdvertisementLoad( Boolean value ) - (ns_st_ia)
+     */
+    carryTvAdvertisementLoad?: boolean;
+    /**
+     * Complete Episode Flag, 1 - if the content media is a full episode, LIVE: Optional, VOD: Optional, Adv: Inherited from Content, Comscore API: classifyAsCompleteEpisode( Boolean value ) - (ns_st_ce)
+     */
+    classifyAsCompleteEpisode?: boolean;
+    /**
+     * The date on which the content was produced or created,  LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setDateOfProduction( int year, int month, int day ) - (ns_st_dt)
+     */
+    dateOfProduction?: ComscoreDate;
+    /**
+     * The time at which the content was produced or created,  LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setTimeOfProduction( int hours, int minutes ) - (ns_st_tm)
+     */
+    timeOfProduction?: ComscoreTime;
+    /**
+     * The date on which the content aired on TV. This metadata helps Comscore establish monetization windows (live, day +1, day +3, etc.) for any given episode or show.
+     * The monetization windows are used to calculate commercial and program ratings. LIVE: Optional,VOD: Optional,Adv: Inherited from Content
+     * Comscore API: setDateOfTvAiring( int year, int month, int day ) - (ns_st_tdt)
+     */
+    dateOfTvAiring?: ComscoreDate;
+    /**
+     * The time at which the content aired on TV,  LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setTimeOfTvAiring( int hours, int minutes ) - (ns_st_ttm)
+     */
+    timeOfTvAiring?: ComscoreTime;
+    /**
+     * The date on which the content was made available for streaming consumption. This metadata helps Comscore establish monetization windows (live, day +1, day +3, etc.) for any given episode or show. The monetization windows are used to calculate commercial and program ratings,  LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setDateOfDigitalAiring( int year, int month, int day ) - (ns_st_ddt)
+     */
+    dateOfDigitalAiring?: ComscoreDate;
+    /**
+     * The time at which the content was made available for streaming consumption,  LIVE: Optional,VOD: Optional,Adv: Inherited from Content, Comscore API: setTimeOfDigitalAiring( int hours, int minutes ) - (ns_st_dtm)
+     */
+    timeOfDigitalAiring?: ComscoreTime;
+    /**
+     * Specify the type of feed provided on the live stream, Comscore API: setFeedType( value ) - (ns_st_ft)
+     */
+    feedType?: ComscoreFeedType;
+    /**
+     * Use value true if the content is audio-only, rather than video (with or without audio). Otherwise omit or use value false, Comscore API: classifyAsAudioStream( Boolean value ) - (ns_st_ty)
+     */
+    classifyAsAudioStream: boolean;
+    /**
+     * Identifies the content delivery to be on-demand or linear, Comscore API:  setDeliveryMode( value ) - (ns_st_cde)
+     */
+    deliveryMode?: ComscoreDeliveryMode;
+    /**
+     * Identifies the type of subscription of the user, Comscore API: setDeliverySubscriptionType( value ) - (ns_st_cds)
+     */
+    deliverySubscriptionType?: ComscoreDeliverySubscriptionType;
+    /**
+     * Indicates whether or not ads are delivered as part of the content stream, Comscore API: setDeliveryComposition( value ) - (ns_st_cdc)
+     */
+    deliveryComposition?: ComscoreDeliveryComposition;
+    /**
+     * Indicate what capability is allowed for advertisement placements, Comscore API: setDeliveryAdvertisementCapability( value ) - (ns_st_cda)
+     */
+    deliveryAdvertisementCapability?: ComscoreDeliveryAdvertisementCapability;
+    /**
+     *  Specify the type of content media in more detail, VOD: Mandatory, Adv: Inherited from Content, Specify the type of content media in more detail, Comscore API: setMediaFormat( value ) - (ns_st_cmt)
+     */
+    mediaFormat?: ComscoreMediaFormat;
+    /**
+     * Content Distribution Model, Specify where the content was distributed, LIVE: Optional, VOD: Optional, Adv: Inherited from Content, Comscore API: setDistributionModel( value ) - (ns_st_cdm)
+     */
+    distributionModel?: ComscoreDistributionModel;
+    /**
+     * Can be used if the player offers the media as part of a playlist. Specify an identifier (title, etc.) for the playlist. For example, the TV Show title for a playlist which contains all episodes from a specific TV show, Comscore API: setPlaylistTitle( string title ) - (ns_st_pl)
+     */
+    playlistTitle?: string;
+    /**
+     * Indicates the total number of segments of the content, which is one more than the number of mid-roll ad breaks. For example, content with no mid-roll ad breaks has 1 segment and content with 2 mid-roll ad breaks has 3 segments, Comscore API: setTotalSegments( int total ) - (ns_st_tp)
+     */
+    totalSegments?: number;
+    /**
+     * The URL (or path/filename) of the content stream, Comscore API: setClipUrl( string url ) - (ns_st_cu)
+     */
+    clipUrl?: string;
+    /**
+     * Content video dimensions in pixels, Comscore API: setVideoDimensions( int pixelsWide, int pixelsHigh ) - (ns_st_cs)
+     */
+    videoDimension?: ComscoreDimension;
+    /**
+     * Can be used to specify a collection of custom metadata name/value pairs, Comscore API: addCustomLabels( Object labels )
+     */
+    customLabels?: CustomComscoreMetadata;
+}
\ No newline at end of file
diff --git a/comscore/src/comscore/ComScore.d.ts b/comscore/src/comscore/ComScore.d.ts
new file mode 100644
index 00000000..de717661
--- /dev/null
+++ b/comscore/src/comscore/ComScore.d.ts
@@ -0,0 +1,265 @@
+declare namespace ns_ {
+    namespace analytics {
+      enum ConnectivityType {
+        UNKNOWN,
+        UNAVAILABLE,
+        DISCONNECTED,
+        CONNECTED,
+        ETHERNET,
+        WIFI,
+        WWAN,
+        BLUETOOTH,
+        EMULATOR
+      }
+
+      enum PlatformAPIs {
+        SmartTV,
+        Netcast,
+        Cordova,
+        Trilithium,
+        AppleTV,
+        Chromecast,
+        Xbox,
+        webOS,
+        tvOS,
+        nodejs,
+        html5,
+        JSMAF,
+        Skeleton,
+        WebBrowser
+      }
+
+      namespace PlatformApi {
+        function setPlatformAPI(platformApi: PlatformAPIs): void;
+        function setPlatformAPI(platformApi: PlatformAPIs, interfaceObject: unknown): void;
+        function setPlatformApi(platformApi: PlatformAPIs, interfaceObject: unknown): void;
+      }
+
+      class StreamingAnalytics {
+        setMediaPlayerName(name: string): void;
+        setMediaPlayerVersion(version: string): void;
+        createPlaybackSession(): void
+        getPlaybackSessionId(): void
+        loopPlaybackSession(): void
+        notifyBufferStart(): void
+        notifyBufferStop(): void
+        notifyChangePlaybackRate(rate: number): void;
+        notifyEnd(): void
+        notifyPause(): void
+        notifyPlay(): void
+        notifySeekStart(): void
+        setDvrWindowLength(length: number): void;
+        setImplementationId(id: string): void;
+        setMetadata(metadata: any): void;
+        setProjectId(id: string): void;
+        startFromDvrWindowOffset(offset: number): void;
+        startFromPosition(position: number): void;
+        startFromSegment(segment: any): void;
+        constructor();
+      }
+  
+      namespace StreamingAnalytics {
+        namespace AdvertisementMetadata {
+            export enum AdvertisementType {
+              ON_DEMAND_PRE_ROLL,
+              ON_DEMAND_MID_ROLL,
+              ON_DEMAND_POST_ROLL,
+              LIVE,
+              BRANDED_ON_DEMAND_PRE_ROLL,
+              BRANDED_ON_DEMAND_MID_ROLL,
+              BRANDED_ON_DEMAND_POST_ROLL,
+              BRANDED_AS_CONTENT,
+              BRANDED_DURING_LIVE,
+              OTHER,
+            }
+
+            export enum AdvertisementDeliveryType {
+                NATIONAL,
+                LOCAL,
+                SYNDICATION
+              }
+          }
+    
+          class AdvertisementMetadata {
+            addCustomLabels(labels: any): void;
+            classifyAsAudioStream(isAudio: boolean): void;
+            setCallToActionUrl(url: string): void;
+            setClipUrl(url: string): void;
+            setDeliveryType(type: StreamingAnalytics.AdvertisementMetadata.AdvertisementDeliveryType): void;
+            setLength(length: number): void;
+            setMediaType(type: StreamingAnalytics.AdvertisementMetadata.AdvertisementType): void;
+            setOwner(owner: string): void;
+            setPlacementId(id: string): void;
+            setRelatedContentMetadata(metadata: any): void;
+            setServer(server: string): void;
+            setServerCampaignId(id: string): void;
+            setSiteId(id: string): void;
+            setTitle(title: string): void;
+            setUniqueId(id: string): void;
+            setVideoDimensions(width: number, height: number): void;
+
+            getMetadataLabels(): any;
+
+    
+            constructor();
+          }
+
+        namespace ContentMetadata {
+
+          export enum ContentDeliveryAdvertisementCapability {
+            NONE,
+            DYNAMIC_LOAD,
+            DYNAMIC_REPLACEMENT,
+            LINEAR_1DAY,
+            LINEAR_2DAY,
+            LINEAR_3DAY,
+            LINEAR_4DAY,
+            LINEAR_5DAY,
+            LINEAR_6DAY,
+            LINEAR_7DAY
+          }
+
+          export enum ContentDeliveryComposition {
+            CLEAN,
+            EMBED
+          }
+
+          export enum ContentDeliveryMode {
+            LINEAR,
+            ON_DEMAND
+          }
+
+          export enum ContentDeliverySubscriptionType {
+            ADVERTISING,
+            PREMIUM,
+            SUBSCRIPTION,
+            TRADITIONAL_MVPD,
+            TRANSACTIONAL,
+            VIRTUAL_MVPD,
+          }
+
+          export enum ContentDistributionModel {
+            EXCLUSIVELY_ONLINE,
+            TV_AND_ONLINE
+          }
+
+          export enum ContentFeedType {
+            EAST_HD,
+            EAST_SD,
+            OTHER,
+            WEST_HD,
+            WEST_SD
+          }
+
+          export enum ContentMediaFormat {
+            EXTRA_EPISODE,
+            EXTRA_GENERIC,
+            EXTRA_MOVIE,
+            FULL_CONTENT_EPISODE,
+            FULL_CONTENT_GENERIC,
+            FULL_CONTENT_MOVIE,
+            PARTIAL_CONTENT_EPISODE,
+            PARTIAL_CONTENT_GENERIC,
+            PARTIAL_CONTENT_MOVIE,
+            PREVIEW_EPISODE,
+            PREVIEW_GENERIC,
+            PREVIEW_MOVIE
+          }
+
+          export enum ContentType {
+            LONG_FORM_ON_DEMAND,
+            SHORT_FORM_ON_DEMAND,
+            LIVE,
+            USER_GENERATED_SHORT_FORM_ON_DEMAND,
+            USER_GENERATED_LONG_FORM_ON_DEMAND,
+            USER_GENERATED_LIVE,
+            BUMPER,
+            OTHER,
+          }
+        }
+  
+        class ContentMetadata {
+            addCustomLabels(labels: any): void;
+            carryTvAdvertisementLoad(carriesTvAdvertisementLoad: boolean): void;
+            classifyAsAudioStream(audioStream: boolean): void;
+            classifyAsCompleteEpisode(completeEpisode: boolean): void;
+            setClipUrl(url: string): void;
+            setDateOfDigitalAiring(year: number, month: number, day: number): void;
+            setDateOfProduction(year: number, month: number, day: number): void;
+            setDateOfTvAiring(year: number, month: number, day: number): void;
+            setDeliveryAdvertisementCapability(value: StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability): void;
+            setDeliveryComposition(value: StreamingAnalytics.ContentMetadata.ContentDeliveryComposition): void;
+            setDeliveryMode(value: StreamingAnalytics.ContentMetadata.ContentDeliveryMode): void;
+            setDeliverySubscriptionType(value: StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType): void;
+            setDictionaryClassificationC3(value: string): void;
+            setDictionaryClassificationC4(value: string): void;
+            setDictionaryClassificationC6(value: string): void;
+            setDistributionModel(value: StreamingAnalytics.ContentMetadata.ContentDistributionModel): void;
+            setEpisodeId(id: string): void;
+            setEpisodeNumber(episodeNumber: string): void;
+            setEpisodeSeasonNumber(seasonNumber: string): void;
+            setEpisodeTitle(title: string): void;
+            setFeedType(value: StreamingAnalytics.ContentMetadata.ContentFeedType): void;
+            setGenreId(id: string): void;
+            setGenreName(name: string): void;
+            setLength(length: number): void;
+            setMediaFormat(value: StreamingAnalytics.ContentMetadata.ContentMediaFormat): void;
+            setMediaType(value: StreamingAnalytics.ContentMetadata.ContentType): void;
+            setNetworkAffiliate(code: string): void;
+            setPlaylistTitle(title: string): void;
+            setProgramId(id: string): void;
+            setProgramTitle(title: string): void;
+            setPublisherName(name: string): void;
+            setStationCode(code: string): void;
+            setStationTitle(title: string): void;
+            setTimeOfDigitalAiring(hours: number, minutes: number): void;
+            setTimeOfProduction(hours: number, minutes: number): void;
+            setTimeOfTvAiring(hours: number, minutes: number): void;
+            setTotalSegments(total: number): void;
+            setUniqueId(id: string): void;
+            setVideoDimensions(width: number, height: number): void;
+
+            getMetadataLabels(): any;
+  
+            constructor();
+
+        }
+
+      }
+
+      namespace configuration {
+        function setApplicationName(name: string): void;
+  
+        function setApplicationVersion(name: string): void;
+  
+        function addClient(config: PublisherConfiguration): void;
+  
+        function getPublisherConfiguration(id: string): any;
+  
+        function setPersistentLabel(name: string, value: any): void;
+  
+        function addPersistentLabels(labels: any): void;
+  
+        function enableImplementationValidationMode(): void;
+  
+        function enableChildDirectedApplicationMode(): void;
+  
+        class PublisherConfiguration {
+          publisherId: string;
+          constructor({ }: any)
+        }
+      }
+  
+      function notifyHiddenEvent(): void;
+  
+      function notifyEnterForeground(): void;
+  
+      function notifyExitForeground(): void;
+  
+      function close(): void;
+  
+      function start(): void;
+
+    }
+  }
+  
\ No newline at end of file
diff --git a/comscore/src/index.ts b/comscore/src/index.ts
new file mode 100644
index 00000000..bce42319
--- /dev/null
+++ b/comscore/src/index.ts
@@ -0,0 +1,3 @@
+export { ComscoreConnector } from './api/ComscoreConnector';
+export * from './api/ComscoreMetadata';
+export * from './api/ComscoreConfiguration';
diff --git a/comscore/src/integration/ComscoreContentMetadata.ts b/comscore/src/integration/ComscoreContentMetadata.ts
new file mode 100644
index 00000000..0f6ddd1d
--- /dev/null
+++ b/comscore/src/integration/ComscoreContentMetadata.ts
@@ -0,0 +1,332 @@
+import {
+    ComscoreDeliveryAdvertisementCapability,
+    ComscoreDeliveryComposition,
+    ComscoreDeliveryMode,
+    ComscoreDeliverySubscriptionType,
+    ComscoreDistributionModel,
+    ComscoreFeedType,
+    ComscoreMediaFormat,
+    ComscoreMediaType,
+    ComscoreMetadata
+} from '../api/ComscoreMetadata';
+
+export const buildContentMetadata = (metadata: ComscoreMetadata): ns_.analytics.StreamingAnalytics.ContentMetadata => {
+    const contentMetadata = new ns_.analytics.StreamingAnalytics.ContentMetadata();
+    const {
+        mediaType,
+        uniqueId,
+        length,
+        c3,
+        c4,
+        c6,
+        stationTitle,
+        stationCode,
+        networkAffiliate,
+        publisherName,
+        programTitle,
+        programId,
+        episodeTitle,
+        episodeId,
+        episodeSeasonNumber,
+        episodeNumber,
+        genreName,
+        genreId,
+        carryTvAdvertisementLoad,
+        classifyAsCompleteEpisode,
+        dateOfProduction,
+        timeOfProduction,
+        dateOfTvAiring,
+        timeOfTvAiring,
+        dateOfDigitalAiring,
+        timeOfDigitalAiring,
+        feedType,
+        classifyAsAudioStream,
+        deliveryMode,
+        deliverySubscriptionType,
+        deliveryComposition,
+        deliveryAdvertisementCapability,
+        mediaFormat,
+        distributionModel,
+        playlistTitle,
+        totalSegments,
+        clipUrl,
+        videoDimension,
+        customLabels
+    } = metadata;
+    contentMetadata.setMediaType(mapMediaType(mediaType));
+    contentMetadata.setUniqueId(uniqueId);
+    contentMetadata.setLength(length);
+    if (c3) {
+        contentMetadata.setDictionaryClassificationC3(c3);
+    }
+    if (c4) {
+        contentMetadata.setDictionaryClassificationC4(c4);
+    }
+    if (c6) {
+        contentMetadata.setDictionaryClassificationC6(c6);
+    }
+    contentMetadata.setStationTitle(stationTitle);
+    if (stationCode) {
+        contentMetadata.setStationCode(stationCode);
+    }
+    if (networkAffiliate) {
+        contentMetadata.setNetworkAffiliate(networkAffiliate);
+    }
+    if (publisherName) {
+        contentMetadata.setPublisherName(publisherName);
+    }
+    contentMetadata.setProgramTitle(programTitle);
+    if (programId) {
+        contentMetadata.setProgramId(programId);
+    }
+    contentMetadata.setEpisodeTitle(episodeTitle);
+    if (episodeId) {
+        contentMetadata.setEpisodeId(episodeId);
+    }
+    if (episodeSeasonNumber) {
+        contentMetadata.setEpisodeSeasonNumber(episodeSeasonNumber);
+    }
+    if (episodeNumber) {
+        contentMetadata.setEpisodeNumber(episodeNumber);
+    }
+    contentMetadata.setGenreName(genreName);
+    if (genreId) {
+        contentMetadata.setGenreId(genreId);
+    }
+    if (carryTvAdvertisementLoad) {
+        contentMetadata.carryTvAdvertisementLoad(carryTvAdvertisementLoad);
+    }
+    if (classifyAsCompleteEpisode) {
+        contentMetadata.classifyAsCompleteEpisode(classifyAsCompleteEpisode);
+    }
+    if (dateOfProduction) {
+        const { year, month, day } = dateOfProduction;
+        contentMetadata.setDateOfProduction(year, month, day);
+    }
+    if (timeOfProduction) {
+        const { hours, minutes } = timeOfProduction;
+        contentMetadata.setTimeOfProduction(hours, minutes);
+    }
+    if (dateOfTvAiring) {
+        const { year, month, day } = dateOfTvAiring;
+        contentMetadata.setDateOfTvAiring(year, month, day);
+    }
+    if (timeOfTvAiring) {
+        const { hours, minutes } = timeOfTvAiring;
+        contentMetadata.setTimeOfTvAiring(hours, minutes);
+    }
+    if (dateOfDigitalAiring) {
+        const { year, month, day } = dateOfDigitalAiring;
+        contentMetadata.setDateOfDigitalAiring(year, month, day);
+    }
+    if (timeOfDigitalAiring) {
+        const { hours, minutes } = timeOfDigitalAiring;
+        contentMetadata.setTimeOfDigitalAiring(hours, minutes);
+    }
+    if (feedType) {
+        contentMetadata.setFeedType(mapFeedType(feedType));
+    }
+    contentMetadata.classifyAsAudioStream(classifyAsAudioStream);
+    if (deliveryMode) {
+        contentMetadata.setDeliveryMode(mapDeliveryMode(deliveryMode));
+    }
+    if (deliverySubscriptionType) {
+        contentMetadata.setDeliverySubscriptionType(mapDeliverySubscriptionType(deliverySubscriptionType));
+    }
+    if (deliveryComposition) {
+        contentMetadata.setDeliveryComposition(mapDeliveryComposition(deliveryComposition));
+    }
+    if (deliveryAdvertisementCapability) {
+        contentMetadata.setDeliveryAdvertisementCapability(
+            mapDeliveryAdvertisementCapability(deliveryAdvertisementCapability)
+        );
+    }
+    if (mediaFormat) {
+        contentMetadata.setMediaFormat(mapMediaFormat(mediaFormat));
+    }
+    if (distributionModel) {
+        contentMetadata.setDistributionModel(mapDistributionModel(distributionModel));
+    }
+    if (playlistTitle) {
+        contentMetadata.setPlaylistTitle(playlistTitle);
+    }
+    if (totalSegments) {
+        contentMetadata.setTotalSegments(totalSegments);
+    }
+    if (clipUrl) {
+        contentMetadata.setClipUrl(clipUrl);
+    }
+    if (videoDimension) {
+        const { width, height } = videoDimension;
+        contentMetadata.setVideoDimensions(width, height);
+    }
+    if (customLabels) {
+        contentMetadata.addCustomLabels(customLabels);
+    }
+    return contentMetadata;
+};
+
+const mapMediaType = (mediaType: ComscoreMediaType): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType => {
+    switch (mediaType) {
+        case ComscoreMediaType.bumper:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.BUMPER;
+        case ComscoreMediaType.live:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.LIVE;
+        case ComscoreMediaType.longFormOnDemand:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.LONG_FORM_ON_DEMAND;
+        case ComscoreMediaType.other:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.OTHER;
+        case ComscoreMediaType.shortFormOnDemand:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.SHORT_FORM_ON_DEMAND;
+        case ComscoreMediaType.userGeneratedLive:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.USER_GENERATED_LIVE;
+        case ComscoreMediaType.userGeneratedLongFormOnDemand:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.USER_GENERATED_LONG_FORM_ON_DEMAND;
+        case ComscoreMediaType.userGeneratedShortFormOnDemand:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.USER_GENERATED_SHORT_FORM_ON_DEMAND;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentType.OTHER;
+    }
+};
+
+const mapFeedType = (feedType: ComscoreFeedType): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType => {
+    switch (feedType) {
+        case ComscoreFeedType.eastHD:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType.EAST_HD;
+        case ComscoreFeedType.westHD:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType.WEST_HD;
+        case ComscoreFeedType.eastSD:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType.EAST_SD;
+        case ComscoreFeedType.westSD:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType.WEST_SD;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentFeedType.OTHER;
+    }
+};
+
+const mapDeliveryMode = (
+    deliveryMode: ComscoreDeliveryMode
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryMode => {
+    switch (deliveryMode) {
+        case ComscoreDeliveryMode.linear:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryMode.LINEAR;
+        case ComscoreDeliveryMode.ondemand:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryMode.ON_DEMAND;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryMode.ON_DEMAND;
+    }
+};
+
+const mapDeliverySubscriptionType = (
+    deliverySubscriptionType: ComscoreDeliverySubscriptionType
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType => {
+    switch (deliverySubscriptionType) {
+        case ComscoreDeliverySubscriptionType.traditionalMvpd:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.TRADITIONAL_MVPD;
+        case ComscoreDeliverySubscriptionType.virtualMvpd:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.VIRTUAL_MVPD;
+        case ComscoreDeliverySubscriptionType.subscription:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.SUBSCRIPTION;
+        case ComscoreDeliverySubscriptionType.transactional:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.TRANSACTIONAL;
+        case ComscoreDeliverySubscriptionType.advertising:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.ADVERTISING;
+        case ComscoreDeliverySubscriptionType.premium:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.PREMIUM;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliverySubscriptionType.SUBSCRIPTION;
+    }
+};
+
+const mapDeliveryComposition = (
+    deliveryComposition: ComscoreDeliveryComposition
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryComposition => {
+    switch (deliveryComposition) {
+        case ComscoreDeliveryComposition.clean:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryComposition.CLEAN;
+        case ComscoreDeliveryComposition.embed:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryComposition.EMBED;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryComposition.EMBED;
+    }
+};
+
+const mapDeliveryAdvertisementCapability = (
+    deliveryAdvertisementCapability: ComscoreDeliveryAdvertisementCapability
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability => {
+    switch (deliveryAdvertisementCapability) {
+        case ComscoreDeliveryAdvertisementCapability.none:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.NONE;
+        case ComscoreDeliveryAdvertisementCapability.dynamicLoad:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.DYNAMIC_LOAD;
+        case ComscoreDeliveryAdvertisementCapability.dynamicReplacement:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability
+                .DYNAMIC_REPLACEMENT;
+        case ComscoreDeliveryAdvertisementCapability.linear1day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_1DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear2day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_2DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear3day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_3DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear4day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_4DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear5day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_5DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear6day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_6DAY;
+        case ComscoreDeliveryAdvertisementCapability.linear7day:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.LINEAR_7DAY;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDeliveryAdvertisementCapability.NONE;
+    }
+};
+
+const mapMediaFormat = (
+    mediaFormat: ComscoreMediaFormat
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat => {
+    switch (mediaFormat) {
+        case ComscoreMediaFormat.fullContentEpisode:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.FULL_CONTENT_EPISODE;
+        case ComscoreMediaFormat.fullContentMovie:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.FULL_CONTENT_MOVIE;
+        case ComscoreMediaFormat.fullContentPodcast:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.FULL_CONTENT_GENERIC;
+        case ComscoreMediaFormat.fullContentGeneric:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.FULL_CONTENT_GENERIC;
+        case ComscoreMediaFormat.partialContentEpisode:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PARTIAL_CONTENT_EPISODE;
+        case ComscoreMediaFormat.partialContentMovie:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PARTIAL_CONTENT_MOVIE;
+        case ComscoreMediaFormat.partialContentPodcast:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PARTIAL_CONTENT_GENERIC;
+        case ComscoreMediaFormat.partialContentGeneric:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PARTIAL_CONTENT_GENERIC;
+        case ComscoreMediaFormat.previewEpisode:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PREVIEW_EPISODE;
+        case ComscoreMediaFormat.previewMovie:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PREVIEW_MOVIE;
+        case ComscoreMediaFormat.previewGeneric:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.PREVIEW_GENERIC;
+        case ComscoreMediaFormat.extraEpisode:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.EXTRA_EPISODE;
+        case ComscoreMediaFormat.extraMovie:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.EXTRA_MOVIE;
+        case ComscoreMediaFormat.extraGeneric:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.EXTRA_GENERIC;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentMediaFormat.FULL_CONTENT_GENERIC;
+    }
+};
+
+const mapDistributionModel = (
+    distributionModel: ComscoreDistributionModel
+): ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDistributionModel => {
+    switch (distributionModel) {
+        case ComscoreDistributionModel.tvAndOnline:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDistributionModel.TV_AND_ONLINE;
+        case ComscoreDistributionModel.exclusivelyOnline:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDistributionModel.EXCLUSIVELY_ONLINE;
+        default:
+            return ns_.analytics.StreamingAnalytics.ContentMetadata.ContentDistributionModel.EXCLUSIVELY_ONLINE;
+    }
+};
diff --git a/comscore/src/integration/ComscoreStreamingAnalyticsTHEOIntegration.ts b/comscore/src/integration/ComscoreStreamingAnalyticsTHEOIntegration.ts
new file mode 100644
index 00000000..352905db
--- /dev/null
+++ b/comscore/src/integration/ComscoreStreamingAnalyticsTHEOIntegration.ts
@@ -0,0 +1,521 @@
+import {
+    AdBreakEvent,
+    AdEvent,
+    ChromelessPlayer,
+    EndedEvent,
+    LoadedMetadataEvent,
+    PauseEvent,
+    PlayEvent,
+    PlayingEvent,
+    RateChangeEvent,
+    SeekedEvent,
+    SeekingEvent,
+    SourceChangeEvent,
+    WaitingEvent,
+    ErrorEvent,
+    version
+} from 'theoplayer';
+import { ComscoreConfiguration } from '../api/ComscoreConfiguration';
+import { ComscoreMetadata } from '../api/ComscoreMetadata';
+import { buildContentMetadata } from './ComscoreContentMetadata';
+
+const LOG_STATE_CHANGES = true;
+const LOG_THEOPLAYER_EVENTS = true;
+const LOG_STREAMINGANALYTICS = true;
+
+enum ComscoreState {
+    INITIALIZED = 'INITIALIZED',
+    ADVERTISEMENT = 'ADVERTISEMENT',
+    ADVERTISEMENT_PAUSED = 'ADVERTISEMENT_PAUSED',
+    VIDEO = 'VIDEO',
+    VIDEO_PAUSED = 'VIDEO_PAUSED',
+    STOPPED = 'STOPPED'
+}
+
+enum AdBreakType {
+    PRE_ROLL,
+    MID_ROLL,
+    POST_ROLL
+}
+
+export class ComscoreStreamingAnalyticsTHEOIntegration {
+    // References for constructor arguments
+    private player: ChromelessPlayer;
+    private configuration: ComscoreConfiguration;
+    private metadata: ComscoreMetadata;
+
+    // Playback state managed by the integration
+    private state: ComscoreState = ComscoreState.INITIALIZED;
+    private buffering: boolean = false;
+    private ended: boolean = false;
+
+    // Comscore library handles
+    private analytics = ns_.analytics;
+    private streamingAnalytics = new this.analytics.StreamingAnalytics();
+
+    // Copy of main content's ContentMetadata
+    private contentMetadata: ns_.analytics.StreamingAnalytics.ContentMetadata | null = null;
+
+    // Advertisement related fields for use outside of ad event handlers
+    private inAd: boolean = false;
+    private lastAdId: string | undefined = undefined;
+    private lastAdDuration: number | undefined = undefined;
+    private lastAdBreakType: AdBreakType | undefined = undefined;
+
+    constructor(player: ChromelessPlayer, configuration: ComscoreConfiguration, metadata: ComscoreMetadata) {
+        this.player = player;
+        this.configuration = configuration;
+        this.metadata = metadata;
+
+        this.streamingAnalytics.setMediaPlayerName('THEOplayer');
+        this.streamingAnalytics.setMediaPlayerVersion(version);
+
+        this.addListeners();
+    }
+
+    // PUBLIC methods
+    public update(metadata: ComscoreMetadata) {
+        this.metadata = metadata;
+        this.contentMetadata = null;
+    }
+
+    public destroy() {
+        this.removeListeners();
+    }
+
+    private addListeners(): void {
+        this.player.addEventListener('sourcechange', this.onSourceChange);
+        this.player.addEventListener('play', this.onPlay);
+        this.player.addEventListener('ended', this.onEnded);
+        this.player.addEventListener('error', this.onError);
+        this.player.addEventListener('loadedmetadata', this.onLoadedMetadata);
+        this.player.addEventListener('playing', this.onPlaying);
+        this.player.addEventListener('seeking', this.onSeeking);
+        this.player.addEventListener('seeked', this.onSeeked);
+        this.player.addEventListener('pause', this.onPause);
+        this.player.addEventListener('ratechange', this.onRateChange);
+        this.player.addEventListener('waiting', this.onWaiting);
+
+        if (this.player.ads) {
+            this.player.ads.addEventListener('adbegin', this.onAdBegin);
+            this.player.ads.addEventListener('adbreakend', this.onAdBreakEnd);
+        }
+    }
+
+    private removeListeners(): void {
+        this.player.removeEventListener('sourcechange', this.onSourceChange);
+        this.player.removeEventListener('play', this.onPlay);
+        this.player.removeEventListener('ended', this.onEnded);
+        this.player.removeEventListener('error', this.onError);
+        this.player.removeEventListener('loadedmetadata', this.onLoadedMetadata);
+        this.player.removeEventListener('playing', this.onPlaying);
+        this.player.removeEventListener('seeking', this.onSeeking);
+        this.player.removeEventListener('seeked', this.onSeeked);
+        this.player.removeEventListener('pause', this.onPause);
+        this.player.removeEventListener('ratechange', this.onRateChange);
+        this.player.removeEventListener('waiting', this.onWaiting);
+
+        if (this.player.ads) {
+            this.player.ads.removeEventListener('adbegin', this.onAdBegin);
+            this.player.ads.removeEventListener('adbreakend', this.onAdBreakEnd);
+        }
+    }
+
+    private setContentMetadata(): void {
+        const contentMetadata = buildContentMetadata(this.metadata);
+        this.contentMetadata = contentMetadata;
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS) {
+            console.log(`[COMSCORE - StreamingAnalytics] setMetadata (content)`, contentMetadata.getMetadataLabels());
+        }
+        this.streamingAnalytics.setMetadata(contentMetadata);
+    }
+
+    private setAdMetadata(adDuration: number, adBreakType: AdBreakType, adId: string): void {
+        const adMetadata = new this.analytics.StreamingAnalytics.AdvertisementMetadata();
+        if (this.player.duration === Infinity) {
+            adMetadata.setMediaType(this.analytics.StreamingAnalytics.AdvertisementMetadata.AdvertisementType.LIVE);
+        } else if (adBreakType === AdBreakType.PRE_ROLL) {
+            adMetadata.setMediaType(
+                this.analytics.StreamingAnalytics.AdvertisementMetadata.AdvertisementType.ON_DEMAND_PRE_ROLL
+            );
+        } else if (adBreakType === AdBreakType.POST_ROLL) {
+            adMetadata.setMediaType(
+                this.analytics.StreamingAnalytics.AdvertisementMetadata.AdvertisementType.ON_DEMAND_POST_ROLL
+            );
+        } else {
+            adMetadata.setMediaType(
+                this.analytics.StreamingAnalytics.AdvertisementMetadata.AdvertisementType.ON_DEMAND_MID_ROLL
+            );
+        }
+        adMetadata.setUniqueId(adId);
+        adMetadata.setLength(adDuration);
+
+        if (!this.contentMetadata) buildContentMetadata(this.metadata);
+        adMetadata.setRelatedContentMetadata(this.contentMetadata);
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS) {
+            console.log(`[COMSCORE - StreamingAnalytics] setMetadata (advertisement)`, adMetadata.getMetadataLabels());
+        }
+        this.streamingAnalytics.setMetadata(adMetadata);
+    }
+
+    // STATE TRANSITIONS
+    private transitionToVideo(): void {
+        if (this.configuration.debug && LOG_STATE_CHANGES)
+            console.log(`[COMSCORE - STATE] Trying to transition to VIDEO while in ${this.state}`);
+        switch (this.state) {
+            case ComscoreState.INITIALIZED:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> VIDEO`);
+                this.state = ComscoreState.VIDEO;
+                this.setContentMetadata();
+                break;
+            case ComscoreState.ADVERTISEMENT:
+            case ComscoreState.ADVERTISEMENT_PAUSED:
+            case ComscoreState.STOPPED:
+                this.transitionToStopped();
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> VIDEO`);
+                this.state = ComscoreState.VIDEO;
+                this.setContentMetadata();
+                break;
+            case ComscoreState.VIDEO_PAUSED:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> VIDEO`);
+                this.state = ComscoreState.VIDEO;
+                break;
+            case ComscoreState.VIDEO:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] Ignoring transition from ${this.state} -> VIDEO`);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private transitionToAdvertisement(): void {
+        if (this.configuration.debug && LOG_STATE_CHANGES)
+            console.log(`[COMSCORE - STATE] Trying to transition to ADVERTISEMENT while in ${this.state}`);
+        switch (this.state) {
+            case ComscoreState.INITIALIZED:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> ADVERTISEMENT`);
+                this.state = ComscoreState.ADVERTISEMENT;
+                this.setAdMetadata(
+                    this.lastAdDuration ?? 0,
+                    this.lastAdBreakType ?? AdBreakType.PRE_ROLL,
+                    this.lastAdId ?? ''
+                );
+                break;
+            case ComscoreState.VIDEO:
+            case ComscoreState.VIDEO_PAUSED:
+            case ComscoreState.STOPPED:
+                this.transitionToStopped();
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> ADVERTISEMENT`);
+                this.state = ComscoreState.ADVERTISEMENT;
+                this.setAdMetadata(
+                    this.lastAdDuration ?? 0,
+                    this.lastAdBreakType ?? AdBreakType.PRE_ROLL,
+                    this.lastAdId ?? ''
+                );
+                break;
+            case ComscoreState.ADVERTISEMENT_PAUSED:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> ADVERTISEMENT`);
+                this.state = ComscoreState.ADVERTISEMENT;
+                break;
+            case ComscoreState.ADVERTISEMENT:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] Ignoring transition from ${this.state} -> ADVERTISEMENT`);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private transitionToPaused(): void {
+        if (this.configuration.debug && LOG_STATE_CHANGES)
+            console.log(`[COMSCORE - STATE] Trying to transition to XXXXX_PAUSED while in ${this.state}`);
+        switch (this.state) {
+            case ComscoreState.VIDEO:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> VIDEO_PAUSED`);
+                this.state = ComscoreState.VIDEO_PAUSED;
+                this.streamingAnalytics.notifyPause();
+                if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                    console.log(`[COMSCORE - StreamingAnalytics] notifyPause`);
+                break;
+            case ComscoreState.ADVERTISEMENT:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> ADVERTISEMENT_PAUSED`);
+                this.state = ComscoreState.ADVERTISEMENT_PAUSED;
+                this.streamingAnalytics.notifyPause();
+                if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                    console.log(`[COMSCORE - StreamingAnalytics] notifyPause`);
+                break;
+            default:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] Ignoring transition from ${this.state} -> XXXXX_PAUSED`);
+        }
+    }
+
+    private transitionToStopped(): void {
+        if (this.configuration.debug && LOG_STATE_CHANGES)
+            console.log(`[COMSCORE - STATE] Trying to transition to STOPPED while in ${this.state}`);
+        switch (this.state) {
+            case ComscoreState.STOPPED:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] Ignoring transition from ${this.state} -> STOPPED`);
+                break;
+            default:
+                if (this.configuration.debug && LOG_STATE_CHANGES)
+                    console.log(`[COMSCORE - STATE] State change ${this.state} -> STOPPED`);
+                this.state = ComscoreState.STOPPED;
+                this.streamingAnalytics.notifyEnd();
+                if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                    console.log(`[COMSCORE - StreamingAnalytics] notifyEnd`);
+        }
+    }
+
+    // EVENT HANDLERS
+    private onSourceChange = (event: SourceChangeEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.state = ComscoreState.INITIALIZED;
+        this.contentMetadata = null;
+        this.streamingAnalytics.createPlaybackSession();
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+            console.log(`[COMSCORE - StreamingAnalytics] createPlaybackSession`);
+    };
+
+    private onPlay = (event: PlayEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        if (this.ended) {
+            this.ended = false;
+            if (this.configuration.debug) console.log(`[COMSCORE] play event after the stream ended`);
+            this.streamingAnalytics.createPlaybackSession();
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] createPlaybackSession`);
+        }
+    };
+
+    private onPlaying = (event: PlayingEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        if (this.buffering) {
+            this.buffering = false;
+            this.streamingAnalytics.notifyBufferStop();
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] notifyBufferStop`);
+        }
+
+        const { currentTime } = event;
+
+        if (this.inAd) {
+            this.transitionToAdvertisement();
+        } else if (this.isAfterPostRoll()) {
+            if (this.configuration.debug)
+                console.log(`[COMSCORE] Ignore playing event after post-roll (currentTime ${currentTime})`);
+            return;
+        } else if (this.isBeforePreRoll()) {
+            if (this.configuration.debug)
+                console.log(`[COMSCORE] Ignore playing event before pre-roll (currentTime ${currentTime})`);
+            return;
+        } else if (currentTime < 1 && this.ended === true) {
+            this.ended = false;
+            if (this.configuration.debug) console.log(`[COMSCORE] playing event after the stream ended`);
+            this.streamingAnalytics.createPlaybackSession();
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] createPlaybackSession`);
+            this.transitionToVideo();
+        } else {
+            this.transitionToVideo();
+        }
+        this.streamingAnalytics.notifyPlay();
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+            console.log(`[COMSCORE - StreamingAnalytics] notifyPlay`);
+    };
+
+    private onEnded = (event: EndedEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.transitionToStopped();
+        this.ended = true;
+    };
+
+    private onError = (event: ErrorEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.transitionToStopped();
+    };
+
+    private onLoadedMetadata = (event: LoadedMetadataEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        if (!this.inAd && this.state === ComscoreState.ADVERTISEMENT && !this.isAfterPostRoll()) {
+            this.transitionToVideo();
+        }
+        if (this.metadata.length === 0 && !this.inAd) {
+            if (this.configuration.debug) console.log(`[COMSCORE] LIVE stream detected`);
+            try {
+                const { seekable } = this.player;
+                if (seekable.length) {
+                    const dvrWindowEnd = seekable.end(seekable.length - 1);
+                    const dvrWindowStart = seekable.start(0);
+                    const dvrWindowLengthInSeconds = dvrWindowEnd - dvrWindowStart;
+                    if (dvrWindowLengthInSeconds) {
+                        this.streamingAnalytics.setDvrWindowLength(dvrWindowLengthInSeconds * 1000);
+                        if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                            console.log(
+                                `[COMSCORE - StreamingAnalytics] setDvrWindowLength ${dvrWindowLengthInSeconds * 1000}`
+                            );
+                    } else if (this.configuration.debug) console.log(`[COMSCORE] DVR window length was not > 0`);
+                }
+            } catch (error) {
+                if (this.configuration.debug)
+                    console.log(
+                        `[COMSCORE] There was a problem inspecting the seekable ranges on the loadedmetadata event`
+                    );
+            }
+        }
+    };
+
+    private onSeeking = (event: SeekingEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.streamingAnalytics.notifySeekStart();
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+            console.log(`[COMSCORE - StreamingAnalytics] notifySeekStart`);
+    };
+
+    private onSeeked = (event: SeekedEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        if (!this.inAd && this.state === ComscoreState.ADVERTISEMENT) {
+            this.transitionToVideo();
+        }
+        const { currentTime } = event;
+
+        if (this.player.duration === Infinity) {
+            if (this.configuration.debug) console.log(`[COMSCORE] seeked in a LIVE stream`);
+            const { seekable } = this.player;
+            if (!seekable.length) {
+                if (this.configuration.debug)
+                    console.log(`[COMSCORE] no seekable ranges found when determining DVR window offset`);
+                return;
+            }
+            const dvrWindowEnd = seekable.end(seekable.length - 1);
+            const dvrWindowOffsetInSeconds = dvrWindowEnd - currentTime;
+            this.streamingAnalytics.startFromDvrWindowOffset(dvrWindowOffsetInSeconds * 1000);
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(
+                    `[COMSCORE - StreamingAnalytics] startFromDvrWindowOffset ${dvrWindowOffsetInSeconds * 1000}`
+                );
+        } else {
+            if (this.configuration.debug) console.log(`[COMSCORE] seeked in a VOD stream`);
+            this.streamingAnalytics.startFromPosition(currentTime * 1000);
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] startFromPosition ${currentTime * 1000}`);
+        }
+    };
+
+    private onPause = (event: PauseEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.transitionToPaused();
+    };
+
+    private onAdBegin = (event: AdEvent<'adbegin'>) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        const { ad } = event;
+        const { adIdProcessor } = this.configuration;
+
+        this.inAd = true;
+        this.lastAdBreakType = this.findAdBreakType(
+            ad.adBreak.timeOffset,
+            ad.adBreak.maxDuration ?? 0,
+            ad.adBreak.integration ?? ''
+        );
+        this.lastAdId = adIdProcessor ? adIdProcessor(ad) : ad.id;
+        this.lastAdDuration = ad.duration;
+        if (!this.lastAdDuration && this.configuration.debug) {
+            console.log('[COMSCORE] AD_BEGIN event with an ad duration of 0 found. Please check the ad configuration');
+        }
+        if (!this.lastAdId && this.configuration.debug) {
+            console.log('[COMSCORE] AD_BEGIN event with an empty ad id found. Please check the ad configuration');
+        }
+        if (this.isPlayingGoogleDAISource()) {
+            this.transitionToAdvertisement();
+            this.streamingAnalytics.notifyPlay();
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] notifyPlay`);
+        }
+    };
+
+    private onAdBreakEnd = (event: AdBreakEvent<'adbreakend'>) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.inAd = false;
+    };
+
+    private onRateChange = (event: RateChangeEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        this.streamingAnalytics.notifyChangePlaybackRate(event.playbackRate);
+        if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+            console.log(`[COMSCORE - StreamingAnalytics] notifyChangePlaybackRate ${event.playbackRate}`);
+    };
+
+    private onWaiting = (event: WaitingEvent) => {
+        if (this.configuration.debug && LOG_THEOPLAYER_EVENTS)
+            console.log(`[COMSCORE - THEOplayer EVENTS] ${event.type} event`);
+        if (
+            (this.state === ComscoreState.ADVERTISEMENT && this.inAd) ||
+            (this.state === ComscoreState.VIDEO && !this.inAd)
+        ) {
+            this.buffering = true;
+            this.streamingAnalytics.notifyBufferStart();
+            if (this.configuration.debug && LOG_STREAMINGANALYTICS)
+                console.log(`[COMSCORE - StreamingAnalytics] notifyBufferStart`);
+        }
+    };
+
+    private findAdBreakType = (offset: number, maxDuration: number, integration: string): AdBreakType => {
+        if (offset === 0) {
+            if (this.configuration.debug) console.log('[COMSCORE] Mark as PRE_ROLL');
+            return AdBreakType.PRE_ROLL;
+        }
+
+        switch (integration) {
+            case 'google-ima':
+            case 'theo':
+                if (offset === -1) {
+                    if (this.configuration.debug) console.log('[COMSCORE] Mark as POST_ROLL');
+                    return AdBreakType.POST_ROLL;
+                }
+                if (this.configuration.debug) console.log('[COMSCORE] Mark as MID_ROLL');
+                return AdBreakType.MID_ROLL;
+            case 'google-dai':
+                if (this.player.duration - (offset + maxDuration) <= 0) {
+                    if (this.configuration.debug) console.log('[COMSCORE] Mark as POST_ROLL');
+                    return AdBreakType.POST_ROLL;
+                }
+                if (this.configuration.debug) console.log('[COMSCORE] Mark as MID_ROLL');
+                return AdBreakType.MID_ROLL;
+
+            default:
+                if (this.configuration.debug)
+                    console.log('[COMSCORE] Untested ad integration used, please contact THEOplayer');
+                return AdBreakType.MID_ROLL;
+        }
+    };
+
+    private isBeforePreRoll = (): boolean =>
+        this.player.ads?.scheduledAdBreaks.length ? this.player.ads?.scheduledAdBreaks[0].timeOffset === 0 : false;
+    // private isAfterPostRoll = () => this.lastAdBreakOffset && this.lastAdBreakOffset < 0 && this.player.duration - this.player.currentTime < 1
+    private isAfterPostRoll = (): boolean =>
+        this.lastAdBreakType ? this.lastAdBreakType === AdBreakType.POST_ROLL : false;
+    private isPlayingGoogleDAISource = (): boolean => this.player.ads?.currentAdBreak?.integration === 'google-dai';
+}
diff --git a/comscore/test/pages/main_esm.html b/comscore/test/pages/main_esm.html
new file mode 100644
index 00000000..6f481529
--- /dev/null
+++ b/comscore/test/pages/main_esm.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>Connector test page</title>
+        <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+        <script type="text/javascript" src="//imasdk.googleapis.com/js/sdkloader/ima3_dai.js"></script>
+        <link rel="stylesheet" type="text/css" href="/node_modules/theoplayer/ui.css" />
+        <script src="./../../src/comscore/comscore.js"></script>
+        <script>
+            if (!window.ns_) {
+                console.warn('ComScore SDK was not found. Please add the comscore.js file to src/comscore/ or make the necessary changes to the script tag that loads the library')
+            }
+        </script>
+        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+
+        <style>
+            .dropdown {
+              width: 100%;
+            }
+
+            .btn-primary, .btn-primary:hover, .btn-primary:active, .btn-primary:visited {
+                background-color: #ffc50f;
+                border-color: #ffc50f;
+            }
+          </style>
+    </head>
+    <body>
+        <div class="container" style="padding-bottom: 5px; padding-top: 5px;">
+            <div class="row">
+              <div class="col-auto">
+                <button id="loadbutton" type="button" class="btn btn-primary">Load</button>
+              </div>
+              <div class="col">
+                <select id="source" class="form-control" name="source" style="width: 90%"></select>
+              </div>
+            </div>
+        </div>
+        <div id="THEOplayer" class="theoplayer-container video-js theoplayer-skin"></div>
+        <script type="importmap">
+            {
+              "imports": {
+                "theoplayer": "./../../../node_modules/theoplayer/THEOplayer.esm.js"
+              }
+            }
+        </script>
+        <script type="module">
+            import * as THEOplayer  from 'theoplayer'
+            import { ComscoreConnector } from "../../dist/comscore-connector.esm.js"
+            const element = document.querySelector("#THEOplayer");
+            const selector = document.querySelector('select')
+            const loadButton = document.querySelector('#loadbutton')
+
+            let testAssets
+            let comscoreConnector
+            const comscoreConfig = {
+                publisherId: '<your publisher id>',
+                applicationName: 'Test App',
+                userConsent: "1",
+                adIdProcessor: (ad) => ad.id,
+                debug: true
+            };
+
+            const loadSource = () => {
+                setSourceWithComscoreMetadata(testAssets[selector.value])
+            }
+
+            loadButton.onclick = loadSource
+
+            const player = new THEOplayer.Player(element, {
+                ui: {
+                    fluid: true
+                },
+                libraryLocation: "/node_modules/theoplayer/",
+                license: "<your license>"
+            });
+
+            const setSourceWithComscoreMetadata = (testAsset) => {
+                player.source = testAsset.source
+                comscoreConnector.update(testAsset.metadata)
+            }
+
+            const populateSourceSelector = (testAssets) => {
+                for (let i=0 ; i < testAssets.length ; i++) {
+                    const optionNode = document.createElement('option')
+                    optionNode.label = testAssets[i].label
+                    optionNode.value = i
+                    selector.appendChild(optionNode)
+                }
+            }
+
+            fetch('test-assets.json')
+                .then(res => res.json())
+                .then(jsonResponse => {
+                    testAssets = jsonResponse
+                    player.source = jsonResponse[0].source
+                    const comscoreMetadata = jsonResponse[0].metadata
+                    comscoreConnector = new ComscoreConnector(
+                        player,
+                        comscoreConfig,
+                        comscoreMetadata,
+                    )
+                    populateSourceSelector(jsonResponse)
+                    selector.value = 0
+                })
+
+        </script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+    </body>
+</html>
diff --git a/comscore/test/pages/main_umd.html b/comscore/test/pages/main_umd.html
new file mode 100644
index 00000000..03931c49
--- /dev/null
+++ b/comscore/test/pages/main_umd.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>Connector test page</title>
+        <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+        <script type="text/javascript" src="//imasdk.googleapis.com/js/sdkloader/ima3_dai.js"></script>
+        <link rel="stylesheet" type="text/css" href="/node_modules/theoplayer/ui.css" />
+        <script src="/node_modules/theoplayer/THEOplayer.js"></script>
+        <script src="./../../src/comscore/comscore.js"></script>
+        <script>
+            if (!window.ns_) {
+                console.warn('ComScore SDK was not found. Please add the comscore.js file to src/comscore/ or make the necessary changes to the script tag that loads the library')
+            }
+        </script>
+        <script src="./../../dist/comscore-connector.umd.js"></script>
+        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+
+        <style>
+            .dropdown {
+              width: 100%;
+            }
+
+            .btn-primary, .btn-primary:hover, .btn-primary:active, .btn-primary:visited {
+                background-color: #ffc50f;
+                border-color: #ffc50f;
+            }
+          </style>
+    </head>
+    <body>
+        <div class="container" style="padding-bottom: 5px; padding-top: 5px;">
+            <div class="row">
+              <div class="col-auto">
+                <button id="loadbutton" type="button" class="btn btn-primary">Load</button>
+              </div>
+              <div class="col">
+                <select id="source" class="form-control" name="source" style="width: 90%"></select>
+              </div>
+            </div>
+        </div>
+        <div id="THEOplayer" class="theoplayer-container video-js theoplayer-skin"></div>
+        <script type="text/javascript">
+            const element = document.querySelector("#THEOplayer");
+            const selector = document.querySelector('select')
+            const loadButton = document.querySelector('#loadbutton')
+
+            let testAssets
+            let comscoreConnector
+            const comscoreConfig = {
+                publisherId: '<your publisher id>',
+                applicationName: 'Test App',
+                userConsent: "1",
+                adIdProcessor: (ad) => ad.id,
+                debug: true
+            };
+
+            const loadSource = () => {
+                setSourceWithComscoreMetadata(testAssets[selector.value])
+            }
+
+            loadButton.onclick = loadSource
+
+            const player = new THEOplayer.Player(element, {
+                ui: {
+                    fluid: true
+                },
+                libraryLocation: "/node_modules/theoplayer/",
+                license: "<your license>"
+            });
+
+            const setSourceWithComscoreMetadata = (testAsset) => {
+                player.source = testAsset.source
+                comscoreConnector.update(testAsset.metadata)
+            }
+
+            const populateSourceSelector = (testAssets) => {
+                for (let i=0 ; i < testAssets.length ; i++) {
+                    const optionNode = document.createElement('option')
+                    optionNode.label = testAssets[i].label
+                    optionNode.value = i
+                    selector.appendChild(optionNode)
+                }
+            }
+
+            fetch('test-assets.json')
+                .then(res => res.json())
+                .then(jsonResponse => {
+                    testAssets = jsonResponse
+                    player.source = jsonResponse[0].source
+                    const comscoreMetadata = jsonResponse[0].metadata
+                    comscoreConnector = new THEOplayerComscoreConnector.ComscoreConnector(
+                        player,
+                        comscoreConfig,
+                        comscoreMetadata,
+                    )
+                    populateSourceSelector(jsonResponse)
+                    selector.value = 0
+                })
+
+        </script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+    </body>
+</html>
diff --git a/comscore/test/pages/test-assets.json b/comscore/test/pages/test-assets.json
new file mode 100644
index 00000000..0ef74505
--- /dev/null
+++ b/comscore/test/pages/test-assets.json
@@ -0,0 +1,179 @@
+[
+    {
+        "label": "VOD (HLS)",
+        "source": {
+            "sources": [
+                {
+                    "src": "https://cdn.theoplayer.com/video/big_buck_bunny/big_buck_bunny.m3u8",
+                    "type": "application/x-mpegurl"
+                }
+            ]
+        },
+        "metadata": {
+            "mediaType": "longformOnDemand",
+            "uniqueId": "testuniqueId",
+            "length": 634566,
+            "stationTitle": "THEOTV",
+            "programTitle": "Big Buck Bunny",
+            "episodeTitle": "Intro",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    },
+    {
+        "label": "VOD (HLS) - VMAP (IMA)",
+        "source": {
+            "sources": [
+                {
+                    "src": "https://cdn.theoplayer.com/video/big_buck_bunny/big_buck_bunny.m3u8",
+                    "type": "application/x-mpegurl"
+                }
+            ],
+            "ads": [
+                {
+                    "integration": "google-ima",
+                    "sources": "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/vmap_ad_samples&sz=640x480&cust_params=sample_ar%3Dpremidpost&ciu_szs=300x250&gdfp_req=1&ad_rule=1&output=vmap&unviewed_position_start=1&env=vp&impl=s&cmsid=496&vid=short_onecue&correlator="
+                }
+            ]
+        },
+        "metadata": {
+            "mediaType": "longformOnDemand",
+            "uniqueId": "testuniqueId",
+            "length": 634566,
+            "stationTitle": "THEOTV",
+            "programTitle": "Big Buck Bunny",
+            "episodeTitle": "Intro",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    },
+    {
+        "label": "VOD (HLS) - VMAP (THEOAds)",
+        "source": {
+            "sources": [
+                {
+                    "src": "https://cdn.theoplayer.com/video/big_buck_bunny/big_buck_bunny.m3u8",
+                    "type": "application/x-mpegurl"
+                }
+            ],
+            "ads": [
+                {
+                    "integration": "theo",
+                    "sources": "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/vmap_ad_samples&sz=640x480&cust_params=sample_ar%3Dpremidpost&ciu_szs=300x250&gdfp_req=1&ad_rule=1&output=vmap&unviewed_position_start=1&env=vp&impl=s&cmsid=496&vid=short_onecue&correlator="
+                }
+            ]
+        },
+        "metadata": {
+            "mediaType": "longformOnDemand",
+            "uniqueId": "testuniqueId",
+            "length": 634566,
+            "stationTitle": "THEOTV",
+            "programTitle": "Big Buck Bunny",
+            "episodeTitle": "Intro",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    },
+    {
+        "label": "LIVE (DASH) - VAST pre-roll (IMA)",
+        "source": {
+            "sources": [
+                {
+                    "src": "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd",
+                    "useCredentials": false
+                }
+            ],
+            "ads": [
+                {
+                    "integration": "google-ima",
+                    "timeOffset": "start",
+                    "sources": "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator="
+                }
+            ]
+        },
+        "metadata":             {
+            "mediaType": "live",
+            "uniqueId": "testuniqueId",
+            "length": 0,
+            "stationTitle": "DASHIF",
+            "programTitle": "Livesim",
+            "episodeTitle": "Test",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    },
+    {
+        "label": "LIVE (DASH) - VAST pre-roll (THEOAds)",
+        "source": {
+            "sources": [
+                {
+                    "src": "https://livesim2.dashif.org/livesim2/testpic_2s/Manifest.mpd",
+                    "useCredentials": false
+                }
+            ],
+            "ads": [
+                {
+                    "integration": "theo",
+                    "timeOffset": "start",
+                    "sources": "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator="
+                }
+            ]
+        },
+        "metadata":             {
+            "mediaType": "live",
+            "uniqueId": "testuniqueId",
+            "length": 0,
+            "stationTitle": "DASHIF",
+            "programTitle": "Livesim",
+            "episodeTitle": "Test",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    },
+    {
+        "label": "VOD - Google DAI",
+        "source": {
+            "sources": [
+                {
+                    "type": "application/x-mpegurl",
+                    "ssai": {
+                        "integration": "google-dai",
+                        "availabilityType": "vod",
+                        "contentSourceID": "2528370",
+                        "videoID": "tears-of-steel",
+                        "assetKey": "",
+                        "apiKey": ""
+                    }
+                }
+            ]
+        },
+        "metadata": {
+            "mediaType": "longformOnDemand",
+            "uniqueId": "testuniqueId",
+            "length": 634566,
+            "stationTitle": "DAI",
+            "programTitle": "Google Ad Manager Samples",
+            "episodeTitle": "Tears of Steel",
+            "genreName": "Animation",
+            "classifyAsAudioStream": false,
+            "customLabels": {
+                "testcustomlabel": "testcustomvalue"
+            }
+        }
+    }
+]
\ No newline at end of file
diff --git a/comscore/tsconfig.json b/comscore/tsconfig.json
new file mode 100644
index 00000000..d416c1ae
--- /dev/null
+++ b/comscore/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "declarationDir": "dist/types"
+  },
+  "include": [
+    "src/**/*"
+  ]
+}
diff --git a/comscore/typedoc.json b/comscore/typedoc.json
new file mode 100644
index 00000000..d531c6a5
--- /dev/null
+++ b/comscore/typedoc.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "extends": [
+    "../typedoc.base.json"
+  ],
+  "entryPoints": [
+    "src/index.ts"
+  ],
+  "tsconfig": "tsconfig.json",
+  "readme": "README.md",
+  "name": "Comscore Connector"
+}
diff --git a/conviva/package.json b/conviva/package.json
index d735f4de..4844c04b 100644
--- a/conviva/package.json
+++ b/conviva/package.json
@@ -3,7 +3,6 @@
   "version": "2.1.0",
   "description": "A connector implementing Conviva for web.",
   "main": "dist/conviva-connector.umd.js",
-  "repository": "https://github.com/THEOplayer/conviva-connector-web",
   "homepage": "https://theoplayer.com/",
   "module": "dist/conviva-connector.esm.js",
   "types": "dist/types/index.d.ts",
@@ -25,6 +24,14 @@
     "test": "jest"
   },
   "author": "THEO Technologies NV",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/THEOplayer/web-connectors.git",
+    "directory": "conviva"
+  },
+  "bugs": {
+    "url": "https://github.com/THEOplayer/web-connectors/issues"
+  },
   "license": "MIT",
   "files": [
     "dist/",
diff --git a/nielsen/package.json b/nielsen/package.json
index cd3eb54f..4858cffd 100644
--- a/nielsen/package.json
+++ b/nielsen/package.json
@@ -23,6 +23,14 @@
     "test": "jest"
   },
   "author": "THEO Technologies NV",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/THEOplayer/web-connectors.git",
+    "directory": "nielsen"
+  },
+  "bugs": {
+    "url": "https://github.com/THEOplayer/web-connectors/issues"
+  },
   "license": "MIT",
   "files": [
     "dist/",
diff --git a/package-lock.json b/package-lock.json
index 464f6951..8d1a055a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
         "yospace",
         "conviva",
         "nielsen",
-        "cmcd"
+        "cmcd",
+        "comscore"
       ],
       "devDependencies": {
         "@changesets/cli": "^2.27.1",
@@ -43,22 +44,30 @@
     },
     "cmcd": {
       "name": "@theoplayer/cmcd-connector-web",
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "MIT",
       "peerDependencies": {
         "theoplayer": "^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
+    "comscore": {
+      "name": "@theoplayer/comscore-connector-web",
+      "version": "1.0.20",
+      "license": "MIT",
+      "peerDependencies": {
+        "theoplayer": "^7.0.0"
+      }
+    },
     "conviva": {
       "name": "@theoplayer/conviva-connector-web",
-      "version": "2.0.2",
+      "version": "2.1.0",
       "license": "MIT",
       "devDependencies": {
         "@convivainc/conviva-js-coresdk": "^4.7.4"
       },
       "peerDependencies": {
         "@convivainc/conviva-js-coresdk": "^4.7.4",
-        "@theoplayer/yospace-connector-web": "^2.1.1",
+        "@theoplayer/yospace-connector-web": "^2.1.2",
         "theoplayer": "^5.0.0 || ^6.0.0 || ^7.0.0"
       },
       "peerDependenciesMeta": {
@@ -2391,6 +2400,10 @@
       "resolved": "cmcd",
       "link": true
     },
+    "node_modules/@theoplayer/comscore-connector-web": {
+      "resolved": "comscore",
+      "link": true
+    },
     "node_modules/@theoplayer/conviva-connector-web": {
       "resolved": "conviva",
       "link": true
@@ -8724,7 +8737,7 @@
     },
     "yospace": {
       "name": "@theoplayer/yospace-connector-web",
-      "version": "2.1.1",
+      "version": "2.1.2",
       "license": "MIT",
       "peerDependencies": {
         "theoplayer": "^5.0.0 || ^6.0.0 || ^7.0.0"
diff --git a/package.json b/package.json
index 15f71885..9bbbee84 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "yospace",
     "conviva",
     "nielsen",
-    "cmcd"
+    "cmcd",
+    "comscore"
   ],
   "scripts": {
     "changeset:version": "changeset version && node .changeset/post-process.js",
diff --git a/yospace/package.json b/yospace/package.json
index 8ca2c583..e1de7b0b 100644
--- a/yospace/package.json
+++ b/yospace/package.json
@@ -41,7 +41,7 @@
     "theoplayer": "^5.0.0 || ^6.0.0 || ^7.0.0"
   },
   "bugs": {
-    "url": "https://github.com/THEOplayer/yospace-connector-web/issues"
+    "url": "https://github.com/THEOplayer/web-connectors/issues"
   },
   "directories": {
     "test": "test"