diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js
index 834a211e647355609e87b8f4c7a0593edeee6f54..bcff4587c9f7caf012d434b3d66dfc4e3320c77b 100644
--- a/packages/data-table-view/src/data-table-view.js
+++ b/packages/data-table-view/src/data-table-view.js
@@ -8,13 +8,14 @@ import bttn2 from 'datatables.net-buttons';
 import bttnHtml5 from 'datatables.net-buttons/js/buttons.html5.js';
 import bttnPrint from 'datatables.net-buttons/js/buttons.print.js';
 import {i18n} from './i18n';
-import {css, html, LitElement, unsafeCSS} from 'lit-element';
+import {css, html, unsafeCSS} from 'lit-element';
 import de from '../assets/datatables/i18n/German';
 import en from '../assets/datatables/i18n/English';
 import {getIconSVGURL} from '@dbp-toolkit/common';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import {name as pkgName} from './../package.json';
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
 
 dt(window, $);
 resp(window, $);
@@ -24,7 +25,7 @@ bttn2(window, $);
 bttnHtml5(window, $, jszip);
 bttnPrint(window, $);
 
-export class DataTableView extends LitElement {
+export class DataTableView extends AdapterLitElement {
     constructor() {
         super();
         this.lang = 'de';
@@ -48,7 +49,7 @@ export class DataTableView extends LitElement {
     }
 
     static get properties() {
-        return {
+        return this.getProperties({
             lang: { type: String },
             table: { type: Object, attribute: false },
             paging: { type: Boolean },
@@ -61,7 +62,7 @@ export class DataTableView extends LitElement {
             exportName: { type: String, attribute: 'export-name' },
             columnSearching: { type: Boolean, attribute: 'column-searching'},
             defaultOrder: { type: Array, attribute: 'default-order'}
-        };
+        });
     }
 
     set_columns(cols) {
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 91bd3d52248b307b12aab807c025fc7592afdeb3..572b392a43fdecf0f2f4e869ebe4a46d344f0008 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -4,7 +4,7 @@ import select2 from 'select2';
 import select2LangDe from './i18n/de/select2';
 import select2LangEn from './i18n/en/select2';
 import JSONLD from '@dbp-toolkit/common/jsonld';
-import {css, html, LitElement} from 'lit-element';
+import {css, html} from 'lit-element';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import {i18n} from './i18n.js';
 import {Icon} from '@dbp-toolkit/common';
@@ -12,6 +12,7 @@ import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import select2CSSPath from 'select2/dist/css/select2.min.css';
 import * as errorUtils from "@dbp-toolkit/common/error";
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
 
 
 const personContext = {
@@ -22,7 +23,7 @@ const personContext = {
 
 select2(window, $);
 
-export class PersonSelect extends ScopedElementsMixin(LitElement) {
+export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
 
     constructor() {
         super();
@@ -54,7 +55,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) {
     }
 
     static get properties() {
-        return {
+        return this.getProperties({
             lang: { type: String },
             active: { type: Boolean, attribute: false },
             entryPointUrl: { type: String, attribute: 'entry-point-url' },
@@ -63,7 +64,7 @@ export class PersonSelect extends ScopedElementsMixin(LitElement) {
             showReloadButton: { type: Boolean, attribute: 'show-reload-button' },
             reloadButtonTitle: { type: String, attribute: 'reload-button-title' },
             showBirthDate: { type: Boolean, attribute: 'show-birth-date' },
-        };
+        });
     }
 
     clear() {