diff --git a/package-lock.json b/package-lock.json
index 6b27486..419a482 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1781,9 +1781,9 @@
       "dev": true
     },
     "@elemental-concept/dynamic-form": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@elemental-concept/dynamic-form/-/dynamic-form-1.0.2.tgz",
-      "integrity": "sha512-CAyZIaif6/65LZ8RKJb3QV6jBZxILwZ0zm09sbvGTE1RJ5IRSFJ0m1bfxq7tMlCw5qBqTdT667T+IZ61uSq99Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@elemental-concept/dynamic-form/-/dynamic-form-1.3.1.tgz",
+      "integrity": "sha512-g4dhwQXOF79zdiw2000cIrO3ThZFhVMMUtxf1eM4V+RcUsbfXzvPJZGl3LrhqBZYphm9QnEJ1xv3xs5ABElIQg==",
       "requires": {
         "tslib": "^2.3.0"
       }
diff --git a/package.json b/package.json
index c90e473..9e8752a 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@angular/platform-browser": "^15.0.0",
     "@angular/platform-browser-dynamic": "^15.0.0",
     "@angular/router": "^15.0.0",
-    "@elemental-concept/dynamic-form": "^1.0.2",
+    "@elemental-concept/dynamic-form": "^1.3.1",
     "@ngneat/until-destroy": "^9.2.3",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
diff --git a/projects/lib/package.json b/projects/lib/package.json
index e4ac357..de2fb53 100644
--- a/projects/lib/package.json
+++ b/projects/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elemental-concept/dynamic-form-material",
-  "version": "1.0.3",
+  "version": "1.3.0",
   "description": "This library generates Angular `FormGroup` and related DOM from a specified JSON configuration.",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "@angular/common": "^15.0.0",
     "@angular/core": "^15.0.0",
     "@ngneat/until-destroy": "^9.2.3",
-    "@elemental-concept/dynamic-form": "^1.0.2"
+    "@elemental-concept/dynamic-form": "^1.3.0"
   },
   "dependencies": {
     "tslib": "^2.3.0"
diff --git a/projects/lib/src/lib/components/checkbox-input/checkbox-input.component.ts b/projects/lib/src/lib/components/checkbox-input/checkbox-input.component.ts
index b097da3..fc16d36 100644
--- a/projects/lib/src/lib/components/checkbox-input/checkbox-input.component.ts
+++ b/projects/lib/src/lib/components/checkbox-input/checkbox-input.component.ts
@@ -7,6 +7,6 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './checkbox-input.component.html',
   styleUrls: ['./checkbox-input.component.scss']
 })
-export class CheckboxInputComponent extends CommonInputDirective {
+export class CheckboxInputComponent extends CommonInputDirective<boolean> {
   openExternalLink = (event: Event) => event.stopPropagation();
 }
diff --git a/projects/lib/src/lib/components/datepicker-input/datepicker-input.component.ts b/projects/lib/src/lib/components/datepicker-input/datepicker-input.component.ts
index 535e9d4..bf84fdc 100644
--- a/projects/lib/src/lib/components/datepicker-input/datepicker-input.component.ts
+++ b/projects/lib/src/lib/components/datepicker-input/datepicker-input.component.ts
@@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './datepicker-input.component.html',
   styleUrls: ['./datepicker-input.component.scss']
 })
-export class DatepickerInputComponent extends CommonInputDirective {
+export class DatepickerInputComponent extends CommonInputDirective<string> {
 }
diff --git a/projects/lib/src/lib/components/description/description.component.ts b/projects/lib/src/lib/components/description/description.component.ts
index 86769fc..82f322e 100644
--- a/projects/lib/src/lib/components/description/description.component.ts
+++ b/projects/lib/src/lib/components/description/description.component.ts
@@ -10,12 +10,12 @@ import { MaterialInputMeta } from '../../types';
   templateUrl: './description.component.html',
   styleUrls: ['./description.component.scss']
 })
-export class DescriptionComponent implements DynamicFormDescriptionControl<MaterialInputMeta> {
+export class DescriptionComponent implements DynamicFormDescriptionControl<MaterialInputMeta, string> {
   readonly type = 'description';
 
   formControl: AbstractControl; // not used, but needed when compiling
 
-  dynamicFormElement: DynamicFormElement<MaterialInputMeta>;
+  dynamicFormElement: DynamicFormElement<MaterialInputMeta, string>;
 
   visible = true;
 
diff --git a/projects/lib/src/lib/components/multi-select-input/multi-select-input.component.ts b/projects/lib/src/lib/components/multi-select-input/multi-select-input.component.ts
index 8805dde..5228202 100644
--- a/projects/lib/src/lib/components/multi-select-input/multi-select-input.component.ts
+++ b/projects/lib/src/lib/components/multi-select-input/multi-select-input.component.ts
@@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './multi-select-input.component.html',
   styleUrls: ['./multi-select-input.component.scss']
 })
-export class MultiSelectInputComponent extends CommonInputDirective {
+export class MultiSelectInputComponent extends CommonInputDirective<string | number> {
 }
diff --git a/projects/lib/src/lib/components/radio-input/radio-input.component.ts b/projects/lib/src/lib/components/radio-input/radio-input.component.ts
index 2905426..8e63a37 100644
--- a/projects/lib/src/lib/components/radio-input/radio-input.component.ts
+++ b/projects/lib/src/lib/components/radio-input/radio-input.component.ts
@@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './radio-input.component.html',
   styleUrls: ['./radio-input.component.scss']
 })
-export class RadioInputComponent extends CommonInputDirective {
+export class RadioInputComponent extends CommonInputDirective<boolean> {
 }
diff --git a/projects/lib/src/lib/components/select-input/select-input.component.ts b/projects/lib/src/lib/components/select-input/select-input.component.ts
index 8d847c3..61bd946 100644
--- a/projects/lib/src/lib/components/select-input/select-input.component.ts
+++ b/projects/lib/src/lib/components/select-input/select-input.component.ts
@@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './select-input.component.html',
   styleUrls: ['./select-input.component.scss']
 })
-export class SelectInputComponent extends CommonInputDirective {
+export class SelectInputComponent extends CommonInputDirective<string | number> {
 }
diff --git a/projects/lib/src/lib/components/string-input/string-input.component.ts b/projects/lib/src/lib/components/string-input/string-input.component.ts
index 0106752..45ce786 100644
--- a/projects/lib/src/lib/components/string-input/string-input.component.ts
+++ b/projects/lib/src/lib/components/string-input/string-input.component.ts
@@ -9,7 +9,7 @@ import { SuffixType } from '../../types';
   templateUrl: './string-input.component.html',
   styleUrls: ['./string-input.component.scss']
 })
-export class StringInputComponent extends CommonInputDirective {
+export class StringInputComponent extends CommonInputDirective<string> {
   SuffixType = SuffixType;
 
   onPasswordToggle = (e: Event) => {
diff --git a/projects/lib/src/lib/components/text-input/text-input.component.ts b/projects/lib/src/lib/components/text-input/text-input.component.ts
index e18a7d0..a42eab2 100644
--- a/projects/lib/src/lib/components/text-input/text-input.component.ts
+++ b/projects/lib/src/lib/components/text-input/text-input.component.ts
@@ -7,5 +7,5 @@ import { CommonInputDirective } from '../../directives';
   templateUrl: './text-input.component.html',
   styleUrls: ['./text-input.component.scss']
 })
-export class TextInputComponent extends CommonInputDirective {
+export class TextInputComponent extends CommonInputDirective<string> {
 }
diff --git a/projects/lib/src/lib/directives/common-input/common-input.directive.ts b/projects/lib/src/lib/directives/common-input/common-input.directive.ts
index 480b3c1..4ae1446 100644
--- a/projects/lib/src/lib/directives/common-input/common-input.directive.ts
+++ b/projects/lib/src/lib/directives/common-input/common-input.directive.ts
@@ -11,12 +11,12 @@ import { inputModeMap, MaterialInputMeta } from '../../types';
 
 @UntilDestroy()
 @Directive()
-export class CommonInputDirective implements DynamicFormPassThroughControl<MaterialInputMeta> {
+export class CommonInputDirective<T> implements DynamicFormPassThroughControl<MaterialInputMeta, T> {
   readonly type = 'passthrough';
 
   formGroup: UntypedFormGroup;
 
-  config: DynamicFormElement<MaterialInputMeta>;
+  config: DynamicFormElement<MaterialInputMeta, T>;
 
   visible = true;
 
@@ -42,7 +42,7 @@ export class CommonInputDirective implements DynamicFormPassThroughControl<Mater
       .subscribe(errors => this.errors = errors);
   }
 
-  set dynamicFormElement(element: DynamicFormElement<MaterialInputMeta>) {
+  set dynamicFormElement(element: DynamicFormElement<MaterialInputMeta, T>) {
     this.config = { ...element };
 
     if (this.config.errors === undefined) {
diff --git a/projects/lib/src/lib/material-component-map.ts b/projects/lib/src/lib/material-component-map.ts
index 1aa0e06..f6819e4 100644
--- a/projects/lib/src/lib/material-component-map.ts
+++ b/projects/lib/src/lib/material-component-map.ts
@@ -13,7 +13,7 @@ import {
   TextInputComponent
 } from './components';
 
-export const materialComponentMap: DynamicFormComponentMap<MaterialInputMeta> = {
+export const materialComponentMap: DynamicFormComponentMap<MaterialInputMeta, string | number | boolean> = {
   string: StringInputComponent,
   number: StringInputComponent,
   email: StringInputComponent,