diff --git a/package-lock.json b/package-lock.json
index c75f8ccd2..10361d30c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,9 +140,9 @@
       "dev": true
     },
     "@pnp/buildsystem": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@pnp/buildsystem/-/buildsystem-2.1.0.tgz",
-      "integrity": "sha512-MWwJD53j6FnmdjHLZoTB9YRt5Yz3CrWlkHz+5tOVYGUbT0gwZSO+E/V6XkVxkyggBBalUFzZfpP2RYoYcDTAJw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@pnp/buildsystem/-/buildsystem-2.1.1.tgz",
+      "integrity": "sha512-DLtcoyfGzhuoXiYOdyvwPDqFreOSc41YrsKTV8KiXPoYSnk5jjCIoKwVNQ6qcVBd/PvnAYiIGOW7qS42Ja586g==",
       "dev": true,
       "requires": {
         "@pnp/common": "^2.0.1-2",
@@ -170,6 +170,23 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
         "find-up": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -179,75 +196,11 @@
             "locate-path": "^3.0.0"
           }
         },
-        "gulp": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-          "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-          "dev": true,
-          "requires": {
-            "glob-watcher": "^5.0.3",
-            "gulp-cli": "^2.2.0",
-            "undertaker": "^1.2.1",
-            "vinyl-fs": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-colors": {
-              "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-              "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-              "dev": true,
-              "requires": {
-                "ansi-wrap": "^0.1.0"
-              }
-            },
-            "gulp-cli": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-              "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
-              "dev": true,
-              "requires": {
-                "ansi-colors": "^1.0.1",
-                "archy": "^1.0.0",
-                "array-sort": "^1.0.0",
-                "color-support": "^1.1.3",
-                "concat-stream": "^1.6.0",
-                "copy-props": "^2.0.1",
-                "fancy-log": "^1.3.2",
-                "gulplog": "^1.0.0",
-                "interpret": "^1.1.0",
-                "isobject": "^3.0.1",
-                "liftoff": "^3.1.0",
-                "matchdep": "^2.0.0",
-                "mute-stdout": "^1.0.0",
-                "pretty-hrtime": "^1.0.0",
-                "replace-homedir": "^1.0.0",
-                "semver-greatest-satisfied-range": "^1.1.0",
-                "v8flags": "^3.0.1",
-                "yargs": "^7.1.0"
-              }
-            },
-            "yargs": {
-              "version": "7.1.0",
-              "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-              "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-              "dev": true,
-              "requires": {
-                "camelcase": "^3.0.0",
-                "cliui": "^3.2.0",
-                "decamelize": "^1.1.1",
-                "get-caller-file": "^1.0.1",
-                "os-locale": "^1.4.0",
-                "read-pkg-up": "^1.0.1",
-                "require-directory": "^2.1.1",
-                "require-main-filename": "^1.0.1",
-                "set-blocking": "^2.0.0",
-                "string-width": "^1.0.2",
-                "which-module": "^1.0.0",
-                "y18n": "^3.2.1",
-                "yargs-parser": "^5.0.0"
-              }
-            }
-          }
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
@@ -255,6 +208,23 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -264,6 +234,12 @@
             "ansi-regex": "^4.1.0"
           }
         },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
         "wrap-ansi": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -273,21 +249,14 @@
             "ansi-styles": "^3.2.0",
             "string-width": "^3.0.0",
             "strip-ansi": "^5.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-              "dev": true,
-              "requires": {
-                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^5.1.0"
-              }
-            }
           }
         },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
         "yargs": {
           "version": "14.2.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz",
@@ -305,70 +274,16 @@
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
             "yargs-parser": "^15.0.0"
-          },
-          "dependencies": {
-            "camelcase": {
-              "version": "5.3.1",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-              "dev": true
-            },
-            "cliui": {
-              "version": "5.0.0",
-              "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-              "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-              "dev": true,
-              "requires": {
-                "string-width": "^3.1.0",
-                "strip-ansi": "^5.2.0",
-                "wrap-ansi": "^5.1.0"
-              }
-            },
-            "get-caller-file": {
-              "version": "2.0.5",
-              "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-              "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-              "dev": true
-            },
-            "require-main-filename": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-              "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-              "dev": true
-            },
-            "string-width": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-              "dev": true,
-              "requires": {
-                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^5.1.0"
-              }
-            },
-            "which-module": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-              "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-              "dev": true
-            },
-            "y18n": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-              "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-              "dev": true
-            },
-            "yargs-parser": {
-              "version": "15.0.0",
-              "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz",
-              "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==",
-              "dev": true,
-              "requires": {
-                "camelcase": "^5.0.0",
-                "decamelize": "^1.2.0"
-              }
-            }
+          }
+        },
+        "yargs-parser": {
+          "version": "15.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz",
+          "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -2127,6 +2042,12 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "commander": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
+      "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=",
+      "dev": true
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -3402,14 +3323,6 @@
       "requires": {
         "colors": "~0.6.0-1",
         "commander": "~2.1.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
-          "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=",
-          "dev": true
-        }
       }
     },
     "findup-sync": {
@@ -4427,6 +4340,76 @@
       "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
       "dev": true
     },
+    "gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "requires": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "gulp-cli": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
+          "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "archy": "^1.0.0",
+            "array-sort": "^1.0.0",
+            "color-support": "^1.1.3",
+            "concat-stream": "^1.6.0",
+            "copy-props": "^2.0.1",
+            "fancy-log": "^1.3.2",
+            "gulplog": "^1.0.0",
+            "interpret": "^1.1.0",
+            "isobject": "^3.0.1",
+            "liftoff": "^3.1.0",
+            "matchdep": "^2.0.0",
+            "mute-stdout": "^1.0.0",
+            "pretty-hrtime": "^1.0.0",
+            "replace-homedir": "^1.0.0",
+            "semver-greatest-satisfied-range": "^1.1.0",
+            "v8flags": "^3.0.1",
+            "yargs": "^7.1.0"
+          }
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
+          }
+        }
+      }
+    },
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
diff --git a/package.json b/package.json
index 10d1dacf5..64aa98c22 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^0.1.3",
     "@microsoft/microsoft-graph-types": "^1.8.0",
-    "@pnp/buildsystem": "^2.1.0",
+    "@pnp/buildsystem": "^2.1.1",
     "@types/adal-angular": "^1.0.1",
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "7.1.0",
@@ -52,6 +52,7 @@
     "test": "npm run lint && mocha",
     "build": "pnpbuild -n build",
     "buildDebug": "npm run clean && pnpbuild -n build-debug",
+    "cbuild": "npm run clean && pnpbuild -n build",
     "package": "npm run build && pnpbuild -n package",
     "pnp-publish": "npm run clean && npm run package && pnpbuild -n publish",
     "pnp-publish-beta": "npm run clean && npm run package && pnpbuild -n publish-beta",
diff --git a/packages/graph/decorators.ts b/packages/graph/decorators.ts
index 72adec8d7..2acb52e68 100644
--- a/packages/graph/decorators.ts
+++ b/packages/graph/decorators.ts
@@ -1,7 +1,6 @@
 import { IGraphQueryable } from "./graphqueryable";
 import { graphDelete, graphPatch, graphPost } from "./operations";
-import { body } from "@pnp/odata";
-import { ITypedHash } from "@pnp/common";
+import { body, headers } from "@pnp/odata";
 
 /**
  * Decorator used to specify the default path for Queryable objects
@@ -41,6 +40,29 @@ export interface IDeleteable {
     delete(): Promise<void>;
 }
 
+/**
+ * Adds the delete method to the tagged class
+ */
+export function deleteableWithETag() {
+    return function <T extends { new(...args: any[]): {} }>(target: T) {
+
+        return class extends target {
+            public delete(this: IGraphQueryable, eTag = "*"): Promise<void> {
+                return graphDelete(this, headers({
+                        "If-Match": eTag,
+                }));
+            }
+        };
+    };
+}
+
+export interface IDeleteableWithETag {
+    /**
+     * Delete this instance
+     */
+    delete(eTag?: string): Promise<void>;
+}
+
 /**
  * Adds the update method to the tagged class
  */
@@ -48,14 +70,14 @@ export function updateable() {
     return function <T extends { new(...args: any[]): {} }>(target: T) {
 
         return class extends target {
-            public update(this: IGraphQueryable, props: ITypedHash<any>): Promise<void> {
+            public update(this: IGraphQueryable, props: any): Promise<void> {
                 return graphPatch(this, body(props));
             }
         };
     };
 }
 
-export interface IUpdateable<T = ITypedHash<any>> {
+export interface IUpdateable<T = any> {
     /**
      * Update the properties of an event object
      * 
@@ -64,6 +86,31 @@ export interface IUpdateable<T = ITypedHash<any>> {
     update(props: T): Promise<void>;
 }
 
+/**
+ * Adds the update method to the tagged class
+ */
+export function updateableWithETag() {
+    return function <T extends { new(...args: any[]): {} }>(target: T) {
+
+        return class extends target {
+            public update(this: IGraphQueryable, props: any, eTag = "*"): Promise<void> {
+                return graphPatch(this, body(props, headers({
+                    "If-Match": eTag,
+                })));
+            }
+        };
+    };
+}
+
+export interface IUpdateableWithETag<T = any> {
+    /**
+     * Update the properties of an event object
+     * 
+     * @param props Set of properties to update
+     */
+    update(props: T, eTag?: string): Promise<void>;
+}
+
 /**
  * Adds the add method to the tagged class
  */
@@ -78,7 +125,7 @@ export function addable() {
     };
 }
 
-export interface IAddable<T = ITypedHash<any>, R = { id: string }> {
+export interface IAddable<T = any, R = { id: string }> {
     /**
      * Adds a new item to this collection
      * 
diff --git a/packages/graph/planner/types.ts b/packages/graph/planner/types.ts
index 5c6a34775..18ff4c83f 100644
--- a/packages/graph/planner/types.ts
+++ b/packages/graph/planner/types.ts
@@ -7,7 +7,7 @@ import {
 } from "@microsoft/microsoft-graph-types";
 import { body } from "@pnp/odata";
 import { _GraphQueryableInstance, _GraphQueryableCollection, graphInvokableFactory } from "../graphqueryable";
-import { updateable, IUpdateable, deleteable, IDeleteable, getById, IGetById } from "../decorators";
+import { updateable, IUpdateable, deleteable, IDeleteable, getById, IGetById, deleteableWithETag, IDeleteableWithETag, updateableWithETag, IUpdateableWithETag } from "../decorators";
 import { graphPost } from "../operations";
 import { defaultPath } from "../decorators";
 
@@ -78,10 +78,10 @@ export const Plans = graphInvokableFactory<IPlans>(_Plans);
 /**
  * Task
  */
-@updateable()
-@deleteable()
+@updateableWithETag()
+@deleteableWithETag()
 export class _Task extends _GraphQueryableInstance<IPlannerTaskType> { }
-export interface ITask extends _Task, IUpdateable<IPlannerTaskType>, IDeleteable { }
+export interface ITask extends _Task, IUpdateableWithETag<IPlannerTaskType>, IDeleteableWithETag { }
 export const Task = graphInvokableFactory<ITask>(_Task);
 
 /**
diff --git a/tools/buildsystem/package.json b/tools/buildsystem/package.json
index 165a7ea42..ac4eb29d0 100644
--- a/tools/buildsystem/package.json
+++ b/tools/buildsystem/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnp/buildsystem",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "bin": {
     "pnpbuild": "./bin/buildsystem.js"
   },
diff --git a/tools/buildsystem/src/tasks/package/write-package-files.ts b/tools/buildsystem/src/tasks/package/write-package-files.ts
index 7ff0ca0ff..bfbe9b17e 100644
--- a/tools/buildsystem/src/tasks/package/write-package-files.ts
+++ b/tools/buildsystem/src/tasks/package/write-package-files.ts
@@ -41,7 +41,9 @@ export function writePackageFiles(version: string, config: PackageSchema) {
 
             pkg.version = version;
             pkg.main = `./index.js`;
-            pkg.module = `./module/index.js`;
+            if (packageTarget.moduleTarget) {
+                pkg.module = `./module/index.js`;
+            }
 
             // update our peer dependencies and dependencies placeholder if needed
             for (const key in pkg.peerDependencies) {
diff --git a/tools/polyfill-ie11/index.ts b/tools/polyfill-ie11/index.ts
index 418cf8d74..27299d1ae 100644
--- a/tools/polyfill-ie11/index.ts
+++ b/tools/polyfill-ie11/index.ts
@@ -1,7 +1,8 @@
-import "core-js/modules/es.promise";
-import "core-js/modules/es.array.iterator";
-import "core-js/modules/es.array.from";
-import "core-js/modules/es.array.fill";
-import "core-js/features/reflect";
-import "core-js/features/map";
+import "core-js/stable/array/from";
+import "core-js/stable/array/fill";
+import "core-js/stable/array/iterator";
+import "core-js/stable/promise";
+import "core-js/stable/reflect";
+import "es6-map/implement";
+import "core-js/stable/symbol";
 import "whatwg-fetch";
diff --git a/tools/polyfill-ie11/package-lock.json b/tools/polyfill-ie11/package-lock.json
index 5d79ae38f..cdd699155 100644
--- a/tools/polyfill-ie11/package-lock.json
+++ b/tools/polyfill-ie11/package-lock.json
@@ -1,43 +1,43 @@
 {
   "name": "@pnp/polyfill-ie11",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@pnp/common": {
-      "version": "2.0.0-15",
-      "resolved": "https://registry.npmjs.org/@pnp/common/-/common-2.0.0-15.tgz",
-      "integrity": "sha512-6PmKZellHw2wsFutmNJVvfUkEkzKAhwyo+0MnJU4xEbsHcZpwlb+/v/ajbvAF8Txft3Mv0JF66GTjI1a8PKZig==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@pnp/common/-/common-2.0.0.tgz",
+      "integrity": "sha512-QBbbW4pke74xA3DfJIUu1S1uIgh3CJmoos7rFOxv9MVdAnDoeUQ07IGD7F02x3C3oAoLplxzyuYwqSCECVGAgw==",
       "requires": {
         "tslib": "1.10.0"
       }
     },
     "@pnp/logging": {
-      "version": "2.0.0-15",
-      "resolved": "https://registry.npmjs.org/@pnp/logging/-/logging-2.0.0-15.tgz",
-      "integrity": "sha512-+XXKLh6NTzzerlg/UpMh41T/fKnwa4vx3KPA5TSAMtk9xTVxuqfXNqf5YI9kBT+C4o/UpZafTSdxL7zZXm8m1w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@pnp/logging/-/logging-2.0.0.tgz",
+      "integrity": "sha512-lVJPdIxqsDOrnBEKclLVIzj4aZeFwIa41tn7B8+Pikar0KiA5oSUE/6d6L4rpDFUN5ZTSfQsOeAccwrdtN66iA==",
       "requires": {
         "tslib": "1.10.0"
       }
     },
     "@pnp/odata": {
-      "version": "2.0.0-15",
-      "resolved": "https://registry.npmjs.org/@pnp/odata/-/odata-2.0.0-15.tgz",
-      "integrity": "sha512-tFaOeYJwBj/x0Is3qM+R9vfaFHmHYEoI8TVGvH4Ibk2Se3Ld24nYK0yxT0fgkZPj7q9AQRGE0xCwh3BvyCw22Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@pnp/odata/-/odata-2.0.0.tgz",
+      "integrity": "sha512-pxU3MCf+vzUt7ON2hqfpom8ufVzVIwtM4CPnwcgaW+qrq1eoB4vtFJ0QcLjN2AhESrVZiTfMD3vioLz7tIGSwA==",
       "requires": {
-        "@pnp/common": "2.0.0-15",
-        "@pnp/logging": "2.0.0-15",
+        "@pnp/common": "2.0.0",
+        "@pnp/logging": "2.0.0",
         "tslib": "1.10.0"
       }
     },
     "@pnp/sp": {
-      "version": "2.0.0-15",
-      "resolved": "https://registry.npmjs.org/@pnp/sp/-/sp-2.0.0-15.tgz",
-      "integrity": "sha512-gaN4aQv+20In/lG4RYyDLZujgDacPofj99JaGIFEuslGu98rz/sFhruEP5KBh8nrCPYyFnLdv6q9V4igrTZS/w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@pnp/sp/-/sp-2.0.0.tgz",
+      "integrity": "sha512-4tAxo3QcSQiORl03DUm+RdMSRjUFZQvTm67hiO3ipISB5VnLAiqrTj1nYkSC3zq3RXHkz4mz0i+iquledI1cUg==",
       "requires": {
-        "@pnp/common": "2.0.0-15",
-        "@pnp/logging": "2.0.0-15",
-        "@pnp/odata": "2.0.0-15",
+        "@pnp/common": "2.0.0",
+        "@pnp/logging": "2.0.0",
+        "@pnp/odata": "2.0.0",
         "tslib": "1.10.0"
       }
     },
@@ -921,7 +921,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
       "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
       "requires": {
         "es5-ext": "^0.10.50",
         "type": "^1.0.1"
@@ -1085,7 +1084,6 @@
       "version": "0.10.53",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
       "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.3",
@@ -1096,18 +1094,52 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
         "es6-symbol": "^3.1.1"
       }
     },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      },
+      "dependencies": {
+        "es6-symbol": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+          "requires": {
+            "d": "1",
+            "es5-ext": "~0.10.14"
+          }
+        }
+      }
+    },
     "es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
       "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
       "requires": {
         "d": "^1.0.1",
         "ext": "^1.1.2"
@@ -1144,6 +1176,15 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
     "events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -1199,7 +1240,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
       "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
       "requires": {
         "type": "^2.0.0"
       },
@@ -1207,8 +1247,7 @@
         "type": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
+          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
         }
       }
     },
@@ -2585,8 +2624,7 @@
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
     },
     "node-libs-browser": {
       "version": "2.2.1",
@@ -3512,8 +3550,7 @@
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
     },
     "typedarray": {
       "version": "0.0.6",
diff --git a/tools/polyfill-ie11/package.json b/tools/polyfill-ie11/package.json
index ccda469d9..ce8b4509c 100644
--- a/tools/polyfill-ie11/package.json
+++ b/tools/polyfill-ie11/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pnp/polyfill-ie11",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "pnp - provides required polyfills for ie11",
   "main": "./dist/index.js",
   "types": "./dist",
@@ -9,8 +9,9 @@
     "prepublishOnly": "npm run bundle"
   },
   "dependencies": {
-    "@pnp/sp": "^2.0.0-15",
+    "@pnp/sp": "^2.0.0",
     "core-js": "3.4.7",
+    "es6-map": "0.1.5",
     "whatwg-fetch": "3.0.0"
   },
   "author": {