diff --git a/package-lock.json b/package-lock.json
index 539dacb337..2ca334b3dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2372,6 +2372,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@compas-oscd/xml": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@compas-oscd/xml/-/xml-0.0.1.tgz",
+      "integrity": "sha512-pAfpo0ekenyKDLf4IjokMf0ej+L8U4BbHxxJVvKr6/NCdnletXCRoh2zPNIvjWCp4GTq/oIbM1ZInPwa86YLig==",
+      "license": "Apache-2.0"
+    },
     "node_modules/@custom-elements-manifest/analyzer": {
       "version": "0.6.9",
       "resolved": "https://registry.npmjs.org/@custom-elements-manifest/analyzer/-/analyzer-0.6.9.tgz",
@@ -32003,9 +32009,10 @@
       "dev": true
     },
     "packages/compas-open-scd": {
-      "version": "0.38.0-2",
+      "version": "0.43.0-1",
       "license": "Apache-2.0",
       "dependencies": {
+        "@compas-oscd/xml": "^0.0.1",
         "@material/mwc-dialog": "0.22.1",
         "@material/mwc-drawer": "0.22.1",
         "@material/mwc-fab": "0.22.1",
@@ -39762,6 +39769,11 @@
         }
       }
     },
+    "@compas-oscd/xml": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@compas-oscd/xml/-/xml-0.0.1.tgz",
+      "integrity": "sha512-pAfpo0ekenyKDLf4IjokMf0ej+L8U4BbHxxJVvKr6/NCdnletXCRoh2zPNIvjWCp4GTq/oIbM1ZInPwa86YLig=="
+    },
     "@custom-elements-manifest/analyzer": {
       "version": "0.6.9",
       "resolved": "https://registry.npmjs.org/@custom-elements-manifest/analyzer/-/analyzer-0.6.9.tgz",
@@ -44212,6 +44224,11 @@
         "lit-html": "^1.0.0"
       }
     },
+    "@openenergytools/scl-lib": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@openenergytools/scl-lib/-/scl-lib-1.8.0.tgz",
+      "integrity": "sha512-l8D7boLoUpP+C/J2ue7aY/12euRtK2k4EYKsyysoFto9sySCnlX/KWom5ruP7MtH8n0BEMSUuFg1gKfC+lD80Q=="
+    },
     "@openscd/addons": {
       "version": "file:packages/addons",
       "requires": {
@@ -47034,6 +47051,7 @@
         "@open-wc/eslint-config": "^4.3.0",
         "@open-wc/semantic-dom-diff": "^0.19.5",
         "@open-wc/testing": "^2.5.33",
+        "@openenergytools/scl-lib": "^1.8.0",
         "@openscd/core": "*",
         "@openscd/open-scd": "*",
         "@openscd/wizards": "*",
@@ -51942,6 +51960,7 @@
       "requires": {
         "@commitlint/cli": "^13.1.0",
         "@commitlint/config-conventional": "^13.1.0",
+        "@compas-oscd/xml": "^0.0.1",
         "@material/mwc-dialog": "0.22.1",
         "@material/mwc-drawer": "0.22.1",
         "@material/mwc-fab": "0.22.1",
diff --git a/packages/compas-open-scd/package.json b/packages/compas-open-scd/package.json
index f3429ab510..fbdf349ee1 100644
--- a/packages/compas-open-scd/package.json
+++ b/packages/compas-open-scd/package.json
@@ -43,6 +43,7 @@
     "lit-translate": "^1.2.1",
     "marked": "^4.0.10",
     "panzoom": "^9.4.2",
+    "@compas-oscd/xml": "^0.0.1",
     "@openscd/open-scd": "*",
     "@openscd/plugins": "*",
     "@openscd/addons": "*"
diff --git a/packages/compas-open-scd/src/compas-editors/autogen-substation.ts b/packages/compas-open-scd/src/compas-editors/autogen-substation.ts
index 308da64ce9..1827c19297 100644
--- a/packages/compas-open-scd/src/compas-editors/autogen-substation.ts
+++ b/packages/compas-open-scd/src/compas-editors/autogen-substation.ts
@@ -2,7 +2,7 @@ import { LitElement, property } from 'lit-element';
 import {
   newActionEvent,
 } from '@openscd/core/foundation/deprecated/editor.js';
-import { createElement } from '@openscd/xml';
+import { createElement } from '@compas-oscd/xml';
 import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
 import { get } from 'lit-translate';
 
diff --git a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
index 80ecb363d9..64ff8e895a 100644
--- a/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
+++ b/packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts
@@ -19,7 +19,7 @@ import { IconButton } from '@material/mwc-icon-button';
 
 import { isPublic } from '@openscd/open-scd/src/foundation.js';
 import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
-import { createElement } from '@openscd/xml';
+import { createElement } from '@compas-oscd/xml';
 import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
 
 import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
diff --git a/packages/compas-open-scd/src/compas-wizards/scl.ts b/packages/compas-open-scd/src/compas-wizards/scl.ts
index ef2b117053..147c644b63 100644
--- a/packages/compas-open-scd/src/compas-wizards/scl.ts
+++ b/packages/compas-open-scd/src/compas-wizards/scl.ts
@@ -8,7 +8,7 @@ import {
   WizardInputElement,
 } from '@openscd/open-scd/src/foundation.js';
 
-import { cloneElement } from '@openscd/xml';
+import { cloneElement } from '@compas-oscd/xml';
 
 import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js";
 
diff --git a/packages/compas-open-scd/src/locamation/foundation.ts b/packages/compas-open-scd/src/locamation/foundation.ts
index 1cd22abc22..279c6a01e2 100644
--- a/packages/compas-open-scd/src/locamation/foundation.ts
+++ b/packages/compas-open-scd/src/locamation/foundation.ts
@@ -7,7 +7,7 @@ import {
   getValue,
   WizardInputElement
 } from "@openscd/open-scd/src/foundation.js";
-import { cloneElement } from '@openscd/xml';
+import { cloneElement } from '@compas-oscd/xml';
 import { SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";