diff --git a/package-lock.json b/package-lock.json
index c2a29b6..0749fd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,12 +5,20 @@
   "requires": true,
   "dependencies": {
     "@adobe/aem-angular-editable-components": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@adobe/aem-angular-editable-components/-/aem-angular-editable-components-1.2.0.tgz",
-      "integrity": "sha512-6/OwUBY08/9x7tFUz2CbfxaXkLjLyFkxkWnqsIFVhTZlmyKb8sgXgBGqqEAI0EgDFW0CDLN5ETWOLK4i3eZMgg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@adobe/aem-angular-editable-components/-/aem-angular-editable-components-2.0.0.tgz",
+      "integrity": "sha512-iQc1ypdDKL8F6ptdjHvLOgiwazOJLwnnfYI5lGy1WNzvngzPhoqlrrvQB3Fp5zMkRIwEVNfO3fPUMi65e2fzXw==",
       "dev": true,
       "requires": {
-        "tslib": "^1.10.0"
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+          "dev": true
+        }
       }
     },
     "@adobe/aem-spa-component-mapping": {
diff --git a/package.json b/package.json
index bcf19de..67f5f0d 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.2.0",
+    "@adobe/aem-angular-editable-components": "^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.1.0",
     "@adobe/aem-spa-page-model-manager": "^1.3.3",
     "@angular-devkit/build-angular": "~0.901.11",
diff --git a/projects/aem-angular-core-wcm-components/authoring/button/v1/package.json b/projects/aem-angular-core-wcm-components/authoring/button/v1/package.json
index 0cf01e3..5ea8e30 100644
--- a/projects/aem-angular-core-wcm-components/authoring/button/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/button/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/default/v1/package.json b/projects/aem-angular-core-wcm-components/authoring/default/v1/package.json
index bdecc0f..2524c46 100644
--- a/projects/aem-angular-core-wcm-components/authoring/default/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/default/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/download/v1/package.json b/projects/aem-angular-core-wcm-components/authoring/download/v1/package.json
index c4c846c..9f75ce6 100644
--- a/projects/aem-angular-core-wcm-components/authoring/download/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/download/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/image/v2/package.json b/projects/aem-angular-core-wcm-components/authoring/image/v2/package.json
index aa0c068..ca616d7 100644
--- a/projects/aem-angular-core-wcm-components/authoring/image/v2/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/image/v2/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/list/v2/package.json b/projects/aem-angular-core-wcm-components/authoring/list/v2/package.json
index c8c2fe9..ffd7f53 100644
--- a/projects/aem-angular-core-wcm-components/authoring/list/v2/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/list/v2/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/separator/v1/package.json b/projects/aem-angular-core-wcm-components/authoring/separator/v1/package.json
index 2191443..41cdead 100644
--- a/projects/aem-angular-core-wcm-components/authoring/separator/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/separator/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/teaser/v1/package.json b/projects/aem-angular-core-wcm-components/authoring/teaser/v1/package.json
index 79202bb..32a52d8 100644
--- a/projects/aem-angular-core-wcm-components/authoring/teaser/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/teaser/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/text/v2/package.json b/projects/aem-angular-core-wcm-components/authoring/text/v2/package.json
index f32cd19..e0964a8 100644
--- a/projects/aem-angular-core-wcm-components/authoring/text/v2/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/text/v2/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/authoring/title/v2/package.json b/projects/aem-angular-core-wcm-components/authoring/title/v2/package.json
index 41ff1a1..4100684 100644
--- a/projects/aem-angular-core-wcm-components/authoring/title/v2/package.json
+++ b/projects/aem-angular-core-wcm-components/authoring/title/v2/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/core/package.json b/projects/aem-angular-core-wcm-components/core/package.json
index edccb82..61f0316 100644
--- a/projects/aem-angular-core-wcm-components/core/package.json
+++ b/projects/aem-angular-core-wcm-components/core/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/layout/breadcrumb/v2/package.json b/projects/aem-angular-core-wcm-components/layout/breadcrumb/v2/package.json
index 3aa98b4..2022f23 100644
--- a/projects/aem-angular-core-wcm-components/layout/breadcrumb/v2/package.json
+++ b/projects/aem-angular-core-wcm-components/layout/breadcrumb/v2/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/layout/language-navigation/v1/package.json b/projects/aem-angular-core-wcm-components/layout/language-navigation/v1/package.json
index 0add7f3..0c0ea2d 100644
--- a/projects/aem-angular-core-wcm-components/layout/language-navigation/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/layout/language-navigation/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",
diff --git a/projects/aem-angular-core-wcm-components/layout/navigation/v1/package.json b/projects/aem-angular-core-wcm-components/layout/navigation/v1/package.json
index 1bb0367..447637e 100644
--- a/projects/aem-angular-core-wcm-components/layout/navigation/v1/package.json
+++ b/projects/aem-angular-core-wcm-components/layout/navigation/v1/package.json
@@ -4,7 +4,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@adobe/aem-angular-editable-components": "^1.0.3",
+    "@adobe/aem-angular-editable-components": "^1.0.3 || ^2.0.0",
     "@adobe/aem-spa-component-mapping": "^1.0.5",
     "@adobe/aem-spa-page-model-manager": "^1.0.3",
     "@angular/common": "^9.1.12",