diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/dist/1.0.0/incentro.Backhandler.mpk b/dist/1.0.0/incentro.Backhandler.mpk
index 8d8d586..8053720 100644
Binary files a/dist/1.0.0/incentro.Backhandler.mpk and b/dist/1.0.0/incentro.Backhandler.mpk differ
diff --git a/dist/tmp/widgets/incentro/backhandler/Backhandler.js b/dist/tmp/widgets/incentro/backhandler/Backhandler.js
index 2584a83..fc110a1 100644
--- a/dist/tmp/widgets/incentro/backhandler/Backhandler.js
+++ b/dist/tmp/widgets/incentro/backhandler/Backhandler.js
@@ -111,7 +111,7 @@ class Backhandler extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
     render() {
         return (Object(react__WEBPACK_IMPORTED_MODULE_0__["createElement"])(react_native__WEBPACK_IMPORTED_MODULE_1__["View"], null));
     }
-    componentWillMount() {
+    componentDidMount() {
         react_native__WEBPACK_IMPORTED_MODULE_1__["BackHandler"].addEventListener('hardwareBackPress', this.handleBackButtonClick);
     }
     componentWillUnmount() {
diff --git a/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map b/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
index c738375..1214962 100644
--- a/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
+++ b/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/Backhandler.tsx","webpack:///external \"react\"","webpack:///external \"react-native\""],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;;AClFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAA4D;AACW;AAWhE,MAAM,WAAY,SAAQ,+CAAwC;IACrE,YAAY,KAAoC;QAC5C,KAAK,CAAC,KAAK,CAAC;QACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAGD,MAAM;QACF,OAAO,CACP,4DAAC,iDAAI,OAAQ,CACZ;IACL,CAAC;IAED,kBAAkB;QACd,wDAAW,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAClF,CAAC;IAED,oBAAoB;QAChB,wDAAW,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrF,CAAC;IAED,qBAAqB;;QACjB,UAAI,CAAC,KAAK,CAAC,MAAM,0CAAE,OAAO,GAAG;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;;;;;;;;;;;;ACrCD,kC;;;;;;;;;;;ACAA,yC","file":"widgets/incentro/backhandler/Backhandler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./src/Backhandler.tsx\");\n","import { Component, ReactNode, createElement } from \"react\";\nimport { TextStyle, ViewStyle, BackHandler, View } from \"react-native\";\n\nimport { Style } from \"@mendix/pluggable-widgets-tools\";\n\nimport { BackhandlerProps } from \"../typings/BackhandlerProps\";\n\nexport interface CustomStyle extends Style {\n    container: ViewStyle;\n    label: TextStyle;\n}\n\nexport class Backhandler extends Component<BackhandlerProps<CustomStyle>> {\n    constructor(props: BackhandlerProps<CustomStyle>){\n        super(props)\n        this.handleBackButtonClick = this.handleBackButtonClick.bind(this);\n    }\n\n    //We have to have a render block, or else Mendix Native will crash. Render block is expected.\n    render(): ReactNode {\n        return (\n        <View></View>\n        )\n    }\n\n    componentWillMount() {\n        BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);\n    }\n    \n    componentWillUnmount() {\n        BackHandler.removeEventListener('hardwareBackPress', this.handleBackButtonClick);\n    }\n    \n    handleBackButtonClick() {\n        this.props.onBack?.execute();\n        return true;\n    }\n}\n\n","module.exports = require(\"react\");","module.exports = require(\"react-native\");"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/Backhandler.tsx","webpack:///external \"react\"","webpack:///external \"react-native\""],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;;AClFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAA4D;AACW;AAWhE,MAAM,WAAY,SAAQ,+CAAwC;IACrE,YAAY,KAAoC;QAC5C,KAAK,CAAC,KAAK,CAAC;QACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAGD,MAAM;QACF,OAAO,CACP,4DAAC,iDAAI,OAAQ,CACZ;IACL,CAAC;IAED,iBAAiB;QACb,wDAAW,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAClF,CAAC;IAED,oBAAoB;QAChB,wDAAW,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrF,CAAC;IAED,qBAAqB;;QACjB,UAAI,CAAC,KAAK,CAAC,MAAM,0CAAE,OAAO,GAAG;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;;;;;;;;;;;;ACrCD,kC;;;;;;;;;;;ACAA,yC","file":"widgets/incentro/backhandler/Backhandler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./src/Backhandler.tsx\");\n","import { Component, ReactNode, createElement } from \"react\";\r\nimport { TextStyle, ViewStyle, BackHandler, View } from \"react-native\";\r\n\r\nimport { Style } from \"@mendix/pluggable-widgets-tools\";\r\n\r\nimport { BackhandlerProps } from \"../typings/BackhandlerProps\";\r\n\r\nexport interface CustomStyle extends Style {\r\n    container: ViewStyle;\r\n    label: TextStyle;\r\n}\r\n\r\nexport class Backhandler extends Component<BackhandlerProps<CustomStyle>> {\r\n    constructor(props: BackhandlerProps<CustomStyle>){\r\n        super(props)\r\n        this.handleBackButtonClick = this.handleBackButtonClick.bind(this);\r\n    }\r\n\r\n    //We have to have a render block, or else Mendix Native will crash. Render block is expected.\r\n    render(): ReactNode {\r\n        return (\r\n        <View></View>\r\n        )\r\n    }\r\n\r\n    componentDidMount() {\r\n        BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);\r\n    }\r\n    \r\n    componentWillUnmount() {\r\n        BackHandler.removeEventListener('hardwareBackPress', this.handleBackButtonClick);\r\n    }\r\n    \r\n    handleBackButtonClick() {\r\n        this.props.onBack?.execute();\r\n        return true;\r\n    }\r\n}\r\n\r\n","module.exports = require(\"react\");","module.exports = require(\"react-native\");"],"sourceRoot":""}
\ No newline at end of file
diff --git a/src/Backhandler.tsx b/src/Backhandler.tsx
index 311dc2b..c52ba37 100644
--- a/src/Backhandler.tsx
+++ b/src/Backhandler.tsx
@@ -23,7 +23,7 @@ export class Backhandler extends Component<BackhandlerProps<CustomStyle>> {
         )
     }
 
-    componentWillMount() {
+    componentDidMount() {
         BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);
     }