diff --git a/packages/core/src/data_sources/model/DataSources.ts b/packages/core/src/data_sources/model/DataSources.ts
index 4f7478762..2bb91259b 100644
--- a/packages/core/src/data_sources/model/DataSources.ts
+++ b/packages/core/src/data_sources/model/DataSources.ts
@@ -1,12 +1,12 @@
 import { Collection } from '../../common';
 import EditorModel from '../../editor/model/Editor';
-import { DataSourceProps } from '../types';
+import { DataRecordProps, DataSourceProps } from '../types';
 import DataSource from './DataSource';
 
 export default class DataSources extends Collection<DataSource> {
   em: EditorModel;
 
-  constructor(models: DataSource[] | DataSourceProps[], em: EditorModel) {
+  constructor(models: DataSource[] | DataSourceProps<DataRecordProps>[], em: EditorModel) {
     super(models, em);
     this.em = em;
 
diff --git a/packages/core/src/data_sources/types.ts b/packages/core/src/data_sources/types.ts
index 5399b7dba..95e86123e 100644
--- a/packages/core/src/data_sources/types.ts
+++ b/packages/core/src/data_sources/types.ts
@@ -1,5 +1,7 @@
 import { ObjectAny } from '../common';
 import ComponentDataVariable from './model/ComponentDataVariable';
+import DataRecord from './model/DataRecord';
+import DataRecords from './model/DataRecords';
 import DataVariable, { DataVariableDefinition } from './model/DataVariable';
 import { ConditionalVariableDefinition, DataCondition } from './model/conditional_variables/DataCondition';
 
diff --git a/packages/core/test/specs/data_sources/index.ts b/packages/core/test/specs/data_sources/index.ts
index 2289d8e03..556fecea4 100644
--- a/packages/core/test/specs/data_sources/index.ts
+++ b/packages/core/test/specs/data_sources/index.ts
@@ -6,7 +6,8 @@ import EditorModel from '../../../src/editor/model/Editor';
 describe('DataSourceManager', () => {
   let em: EditorModel;
   let dsm: DataSourceManager;
-  const dsTest: DataSourceProps = {
+  type Record = { id: string; name: string };
+  const dsTest: DataSourceProps<Record> = {
     id: 'ds1',
     records: [
       { id: 'id1', name: 'Name1' },
diff --git a/packages/core/test/specs/data_sources/serialization.ts b/packages/core/test/specs/data_sources/serialization.ts
index 26d95f56d..3cf20005f 100644
--- a/packages/core/test/specs/data_sources/serialization.ts
+++ b/packages/core/test/specs/data_sources/serialization.ts
@@ -13,7 +13,7 @@ describe('DataSource Serialization', () => {
   let em: EditorModel;
   let dsm: DataSourceManager;
   let cmpRoot: ComponentWrapper;
-  const componentDataSource: DataSourceProps = {
+  const componentDataSource = {
     id: 'component-serialization',
     records: [
       { id: 'id1', content: 'Hello World' },
@@ -21,12 +21,12 @@ describe('DataSource Serialization', () => {
     ],
     skipFromStorage: true,
   };
-  const styleDataSource: DataSourceProps = {
+  const styleDataSource = {
     id: 'colors-data',
     records: [{ id: 'id1', color: 'red' }],
     skipFromStorage: true,
   };
-  const traitDataSource: DataSourceProps = {
+  const traitDataSource = {
     id: 'test-input',
     records: [{ id: 'id1', value: 'test-value' }],
     skipFromStorage: true,
diff --git a/packages/core/test/specs/data_sources/storage.ts b/packages/core/test/specs/data_sources/storage.ts
index 79f44498d..47ed85165 100644
--- a/packages/core/test/specs/data_sources/storage.ts
+++ b/packages/core/test/specs/data_sources/storage.ts
@@ -12,12 +12,13 @@ describe('DataSource Storage', () => {
   let em: EditorModel;
   let dsm: DataSourceManager;
   let cmpRoot: ComponentWrapper;
-  const storedDataSource: DataSourceProps = {
+  type Record = { id: string; content: string };
+  const storedDataSource: DataSourceProps<Record> = {
     id: 'component-storage',
     records: [{ id: 'id1', content: 'Hello World' }],
   };
 
-  const nonStoredDataSource: DataSourceProps = {
+  const nonStoredDataSource: DataSourceProps<Record> = {
     id: 'component-non-storage',
     records: [{ id: 'id1', content: 'Hello World' }],
     skipFromStorage: true,
diff --git a/packages/core/test/specs/data_sources/transformers.ts b/packages/core/test/specs/data_sources/transformers.ts
index ee516ddce..6dbec0c0f 100644
--- a/packages/core/test/specs/data_sources/transformers.ts
+++ b/packages/core/test/specs/data_sources/transformers.ts
@@ -19,7 +19,8 @@ describe('DataSource Transformers', () => {
   });
 
   test('should assert that onRecordSetValue is called when adding a record', () => {
-    const testDataSource: DataSourceProps = {
+    type Record = { id: string; content: string };
+    const testDataSource: DataSourceProps<Record> = {
       id: 'test-data-source',
       records: [],
       transformers: {
@@ -58,7 +59,8 @@ describe('DataSource Transformers', () => {
   });
 
   test('should assert that onRecordSetValue is called when setting a value on a record', () => {
-    const testDataSource: DataSourceProps = {
+    type Record = { id: string; content: string };
+    const testDataSource: DataSourceProps<Record> = {
       id: 'test-data-source',
       records: [],
       transformers: {