339 changed files with 7167 additions and 17693 deletions
--- a/.github/workflows/latest.yml
+++ b/.github/workflows/latest.yml
@ -7,20 +7,17 @@ jobs:
        strategy:
            fail-fast: false
            matrix:
-                os: [ubuntu-20.04]
+                os: [ubuntu-18.04]
        runs-on: ${{ matrix.os }}
        steps:
            - uses: actions/checkout@v2
            - uses: actions/setup-node@v2
              with:
                node-version: '16.x'
-            - name: Install ubuntu deps
-              if: contains(matrix.os, 'ubuntu-20.04')
-              run: sudo apt install mesa-common-dev libglu1-mesa-dev libegl1 libopengl-dev
            - name: Install deps
-              run: npm install
+              run: yarn install --ignore-scripts
            - name: Build nodegui
-              run: npm run build
+              run: npx tsc
            - name: Archive using npm pack
              run: npm --no-git-tag-version version 0.0.0-latest-master && npm pack
            - uses: actions/upload-artifact@v1
@ -33,11 +30,11 @@ jobs:
                  code: v0.0.0-latest-master
                  name: Latest Master Release
                  body: >
-                      Latest auto release corresponding to commit ${{github.sha}} 🔥.
-                      To install do:
-                      `npm install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
-                      or
-                      `npm install http://master-release.nodegui.org`
+                      Latest auto release corresponding to commit ${{github.sha}} 🔥. 
+                      To install do: 
+                      `yarn install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
+                      or 
+                      `yarn install http://master-release.nodegui.org`
                  assets: >
                      nodegui-nodegui-0.0.0-latest-master.tgz:nodegui-master.tgz:application/tar+gzip
                  recreate: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -10,18 +10,18 @@ jobs:
    strategy:
      matrix:
        include:
-          - os: ubuntu-20.04
+          - os: ubuntu-18.04
            platform: linux
            arch: x64
          - os: windows-latest
-            platform: win32
+            platfrom: win32
            arch: x64
          - os: macos-latest
            platform: darwin
            arch: x64
    runs-on: ${{ matrix.os }}
    env:
-      ARCHIVE_FILENAME: nodegui-binary-${{github.event.release.tag_name}}-${{ matrix.platform }}-${{ matrix.arch }}.tar.gz
+      ARCHIVE_FILENAME: ${{github.event.release.tag_name}}-${{ matrix.platform }}-${{ matrix.arch }}.tar.gz
    steps:
      - uses: actions/checkout@v2

@ -30,8 +30,8 @@ jobs:
          node-version: '16.x'

      - name: Install ubuntu deps
-        if: contains(matrix.os, 'ubuntu-20.04')
-        run: sudo apt install mesa-common-dev libglu1-mesa-dev libegl1 libopengl-dev
+        if: contains(matrix.os, 'ubuntu-18.04')
+        run: sudo apt install mesa-common-dev libglu1-mesa-dev

      - name: Install deps
        run: npm install
@ -42,7 +42,6 @@ jobs:
          CMAKE_BUILD_PARALLEL_LEVEL: 8

      - name: Compress files
-        if: ${{!contains(matrix.os, 'windows-latest')}}
        uses: a7ul/tar-action@v1.0.2
        id: compress
        with:
@ -52,19 +51,6 @@ jobs:
            ./nodegui_core.node
          outPath: ${{ env.ARCHIVE_FILENAME }}

-      - name: Compress files (Windows)
-        if: contains(matrix.os, 'windows-latest')
-        uses: a7ul/tar-action@v1.0.2
-        id: compress-windows
-        with:
-          command: c
-          cwd: ./build/Release
-          files: |
-            ./nodegui_core.node
-            ./nodegui_core.lib
-            ./nodegui_core.exp
-          outPath: ${{ env.ARCHIVE_FILENAME }}
-
      - uses: actions/upload-artifact@v1
        with:
          name: ${{ env.ARCHIVE_FILENAME }}
@ -89,7 +75,7 @@ jobs:
      - name: Install ubuntu deps
        run: sudo apt update
      - run: sudo apt install mesa-common-dev libglu1-mesa-dev
-      - run: npm install
+      - run: yarn install
      - run: echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> .npmrc
      - run: npm publish --access=public
        env:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -6,7 +6,7 @@ jobs:
        strategy:
            fail-fast: false
            matrix:
-                os: [ubuntu-20.04, windows-latest, macos-latest]
+                os: [ubuntu-18.04, windows-latest, macos-latest]
        runs-on: ${{ matrix.os }}
        steps:
            - uses: actions/checkout@v2
@ -14,8 +14,8 @@ jobs:
              with:
                node-version: '16.x'
            - name: Install ubuntu deps
-              if: contains(matrix.os, 'ubuntu-20.04')
-              run: sudo apt install mesa-common-dev libglu1-mesa-dev libegl1 libopengl-dev
+              if: contains(matrix.os, 'ubuntu')
+              run: sudo apt install mesa-common-dev libglu1-mesa-dev
            - name: Install deps
              run: npm install
            - name: Build nodegui
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -11,7 +11,6 @@ set(CORE_WIDGETS_ADDON "nodegui_core")

 project(${CORE_WIDGETS_ADDON})

-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)

 # Note: CMake+moc also use this list when finding files which `moc` applied.

@ -52,18 +51,14 @@ add_library(${CORE_WIDGETS_ADDON} SHARED
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QDrag/qdrag_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.cpp"
-    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QMoveEvent/qmoveevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QWheelEvent/qwheelevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QNativeGestureEvent/qnativegestureevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QPaintEvent/qpaintevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QTabletEvent/qtabletevent_wrap.cpp"
-    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QTimerEvent/qtimerevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QDropEvent/qdropevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QDragMoveEvent/qdragmoveevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QDragLeaveEvent/qdragleaveevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QResizeEvent/qresizeevent_wrap.cpp"
-    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QInputMethodEvent/qinputmethodevent_wrap.cpp"
-    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QEvent/QInputMethodQueryEvent/qinputmethodqueryevent_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QFontDatabase/qfontdatabase_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QFontMetrics/qfontmetrics_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtGui/QFontMetricsF/qfontmetricsf_wrap.cpp"
@ -162,7 +157,6 @@ add_library(${CORE_WIDGETS_ADDON} SHARED
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtWidgets/QSvgWidget/qsvgwidget_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtWidgets/QStyleFactory/qstylefactory_wrap.cpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtWidgets/QSplitter/qsplitter_wrap.cpp"
-    "${PROJECT_SOURCE_DIR}/src/cpp/lib/QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_wrap.cpp"
    # Custom widgets (include them for automoc since they contain Q_OBJECT)
    "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtCore/QAbstractItemModel/nabstractitemmodel.hpp"
    "${PROJECT_SOURCE_DIR}/src/cpp/include/nodegui/QtCore/QItemSelectionModel/nitemselectionmodel.hpp"
@ -257,27 +251,13 @@ if (WIN32)
        ENABLE_DLL_EXPORT=1
    )
    target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP")
-endif()

-if (UNIX AND NOT APPLE)
-    # Set the RPATH in the binary to a relative one to allow it to find our Qt
-    # libraries regardless of where the base installation directory is.
-    file(RELATIVE_PATH QT_LIBRARY_REL_PATH "${CMAKE_BINARY_DIR}/Release" "${QT_CMAKE_HOME_DIR}/../..")
-    set_target_properties(${CORE_WIDGETS_ADDON} PROPERTIES INSTALL_RPATH "\$ORIGIN/${QT_LIBRARY_REL_PATH}")
-    set_target_properties(${CORE_WIDGETS_ADDON} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-endif()
-
-if (APPLE)
-    set(CMAKE_MACOSX_RPATH ON)
-    file(RELATIVE_PATH QT_LIBRARY_REL_PATH "${CMAKE_BINARY_DIR}/Release" "${QT_CMAKE_HOME_DIR}/../..")
-    set_target_properties(${CORE_WIDGETS_ADDON} PROPERTIES INSTALL_RPATH "@loader_path/${QT_LIBRARY_REL_PATH}")
 endif()

 target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE
    "${CMAKE_JS_LIB}"
-    Qt6::Widgets
-    Qt6::Core
-    Qt6::Gui
-    Qt6::Svg
-    Qt6::SvgWidgets
+    Qt5::Widgets
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Svg
 )
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@

 Build **performant**, **native** and **cross-platform** desktop applications with **Node.js** and **CSS like styling**.🚀

-NodeGUI is powered by **Qt6** 💚 which makes it CPU and memory efficient as compared to other chromium based solutions like Electron.
+NodeGUI is powered by **Qt5** 💚 which makes it CPU and memory efficient as compared to other chromium based solutions like Electron.

 <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/1024px-React-icon.svg.png" alt="" width="25"> If you are looking for **React** based version, check out: **[React NodeGUI](https://github.com/nodegui/react-nodegui)**.

@ -57,16 +57,48 @@ https://github.com/nodegui/examples
 -   Checkout the examples: https://github.com/nodegui/examples .
 -   [Tutorial: Build a native Meme Search Desktop app with Javascript (NodeGui) and Giphy API](https://www.sitepoint.com/build-native-desktop-gif-searcher-app-using-nodegui/)

-
 ## Installation

-To install latest stable release:
+NodeGui requires CMake and Compilation Tools as it is a wrapper for a native C++ widget toolkit QT.
+Detailed instructions here: https://www.sitepoint.com/build-native-desktop-gif-searcher-app-using-nodegui/
+
+TL;DR:
+MacOS
+
+```
+brew install cmake
+brew install make
+```
+
+
+Windows
+https://cmake.org/download/
+
+Linux (Debian/Ubuntu)
+
+```
+sudo apt-get install pkg-config build-essential
+sudo apt-get install cmake make
+sudo apt-get install mesa-common-dev libglu1-mesa-dev
+```
+
+Linux (Fedora/RHEL/CentOS)
+
+```
+sudo dnf groupinstall "Development Tools" "Development Libraries"
+sudo dnf groupinstall "C Development Tools and Libraries"
+sudo dnf install mesa-libGL mesa-libGL-devel
+```
+
+Then install NodeGui from your command line:
+
+#### To install latest stable release:

 ```
 npm install @nodegui/nodegui
 ```

-To install the latest version available on master branch:
+#### To install the latest version available on master branch:

 ```
 npm install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz
@ -89,82 +121,7 @@ npm install @nodegui/nodegui
 See [FAQs](https://github.com/nodegui/nodegui/tree/master/website/docs/faq.md#why-does-installation-fail-at-minimal-qt-setup) for more details.


-
-## Community guides
-
-   [Tutorial: Build a native Meme Search Desktop app with Javascript (NodeGui) and Giphy API](https://www.sitepoint.com/build-native-desktop-gif-searcher-app-using-nodegui/)
-   https://blog.logrocket.com/electron-alternatives-exploring-nodegui-and-react-nodegui/ - Electron alternatives: Exploring NodeGUI and React NodeGUI by [Siegfried Grimbeek](https://blog.logrocket.com/author/siegfriedgrimbeek/).
-   https://hibbard.eu/node-gui/ - Excellent guide from [James Hibbard](https://github.com/jameshibbard).
-
-## Talks/Podcasts
-
-   [NodeGui and React NodeGui at KarmaJS Nov 2019 meetup: https://www.youtube.com/watch?v=8jH5gaEEDv4](https://www.youtube.com/watch?v=8jH5gaEEDv4)
-
-   <audio data-theme="night" data-src="https://changelog.com/jsparty/96/embed" src="https://cdn.changelog.com/uploads/jsparty/96/js-party-96.mp3" preload="none" class="changelog-episode" controls></audio><p><a href="https://changelog.com/jsparty/96">JS Party 96: Performant Node desktop apps with NodeGUI</a> – Listen on <a href="https://changelog.com/">Changelog.com</a></p>
-
-## Docs for contributing
-
-```
-It is easier than you think, try it
-```
-
-Looking to contribute? If you wish to implement a new widget/add more features and need help understanding the codebase, you can start here: [Contributing developer docs](https://github.com/nodegui/nodegui/tree/master/website/docs/development).
-
-Please read https://github.com/nodegui/.github/blob/master/CONTRIBUTING.md
-
-
-## Building from source
-
-This section is useful for those wanting to work on NodeGui itself.
-
-### Required tooling
-
-NodeGui requires CMake and Compilation Tools as it is a wrapper for a native C++ widget toolkit QT.
-Detailed instructions here: https://www.sitepoint.com/build-native-desktop-gif-searcher-app-using-nodegui/
-
-TL;DR:
-
-**MacOS**
-
-```
-brew install cmake
-brew install make
-```
-
-
-**Windows**
-
-https://cmake.org/download/
-
-**Linux (Debian/Ubuntu)**
-
-```
-sudo apt-get install pkg-config build-essential
-sudo apt-get install cmake make
-sudo apt-get install mesa-common-dev libglu1-mesa-dev
-```
-
-**Linux (Fedora/RHEL/CentOS)**
-
-```
-sudo dnf groupinstall "Development Tools" "Development Libraries"
-sudo dnf groupinstall "C Development Tools and Libraries"
-sudo dnf install mesa-libGL mesa-libGL-devel
-```
-
-### Building
-
-Once you have cloned this git repository, run this to build:
-
-```
-npm install
-npm run build
-```
-
-The last step will takes some time to run as it builds the C++ binaries at the core of NodeGui.
-
-
-### Using your own custom Qt installation (Optional)
+#### Using your own custom Qt installation (Optional)

 **Compiling Qt from source**

@ -203,7 +160,7 @@ Now just `rm -rf node_modules` and do `npm install` again.
 The logs should say something like `CustomQt detected at <your qt path>. Hence, skipping Mini Qt installation`.


-### Running example programs
+**Running example programs**

 A number of small programs to show different parts of the Qt API are in `src/examples`. They can be run directly with:

@ -211,6 +168,34 @@ A number of small programs to show different parts of the Qt API are in `src/exa
 npm run qode dist/examples/modelview_1_readonly.js
 ```

+**Community guides**
+
+-   [Tutorial: Build a native Meme Search Desktop app with Javascript (NodeGui) and Giphy API](https://www.sitepoint.com/build-native-desktop-gif-searcher-app-using-nodegui/)
+-   https://blog.logrocket.com/electron-alternatives-exploring-nodegui-and-react-nodegui/ - Electron alternatives: Exploring NodeGUI and React NodeGUI by [Siegfried Grimbeek](https://blog.logrocket.com/author/siegfriedgrimbeek/).
+-   https://hibbard.eu/node-gui/ - Excellent guide from [James Hibbard](https://github.com/jameshibbard).
+
+**Talks/Podcasts**
+
+-   [NodeGui and React NodeGui at KarmaJS Nov 2019 meetup: https://www.youtube.com/watch?v=8jH5gaEEDv4](https://www.youtube.com/watch?v=8jH5gaEEDv4)
+
+-   <audio data-theme="night" data-src="https://changelog.com/jsparty/96/embed" src="https://cdn.changelog.com/uploads/jsparty/96/js-party-96.mp3" preload="none" class="changelog-episode" controls></audio><p><a href="https://changelog.com/jsparty/96">JS Party 96: Performant Node desktop apps with NodeGUI</a> – Listen on <a href="https://changelog.com/">Changelog.com</a></p>
+
+## Docs for contributing
+
+```
+It is easier than you think, try it
+```
+
+Looking to contribute? If you wish to implement a new widget/add more features and need help understanding the codebase, you can start here: [Contributing developer docs](https://github.com/nodegui/nodegui/tree/master/website/docs/development).
+
+Please read https://github.com/nodegui/.github/blob/master/CONTRIBUTING.md
+
+## Building
+
+`npm run build`
+
+Optionally set `QT_INSTALL_DIR='/path/to/qt'` environment variable to build using your own version of Qt.
+
 ## Updating docs

 `npm run docs`
--- a/config/qt.cmake
+++ b/config/qt.cmake
@ -8,7 +8,7 @@ set(CMAKE_AUTOUIC ON)

 set(QTCONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/qtConfig.js)

-macro(AddQtSupport addonName)
+macro(AddQtSupport addonName)    
    execute_process(COMMAND node -p "require('${QTCONFIG_FILE}').qtCmakeDir"
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
        OUTPUT_VARIABLE QT_CMAKE_HOME_DIR
@ -16,10 +16,10 @@ macro(AddQtSupport addonName)

    string(REPLACE "\n" "" QT_CMAKE_HOME_DIR "${QT_CMAKE_HOME_DIR}")
    string(REPLACE "\"" "" QT_CMAKE_HOME_DIR "${QT_CMAKE_HOME_DIR}")
+    
+    message(STATUS "Using QT installation for ${addonName} QT_CMAKE_HOME_DIR:${QT_CMAKE_HOME_DIR}")

-    message(STATUS "Using Qt installation for ${addonName} QT_CMAKE_HOME_DIR:${QT_CMAKE_HOME_DIR}")
-
-    list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_HOME_DIR}/../../..")
-    find_package(Qt6 REQUIRED COMPONENTS Widgets Gui Core Svg SvgWidgets)
-
+    set(Qt5_DIR ${QT_CMAKE_HOME_DIR}) 
+    find_package(Qt5 COMPONENTS Widgets Gui Core Svg REQUIRED)
+      
 endmacro(AddQtSupport addonName)
--- a/config/qtConfig.js
+++ b/config/qtConfig.js
@ -3,7 +3,7 @@ const path = require('path');
 const fs = require('fs');

 const SETUP_DIR = path.resolve(__dirname, '..', 'miniqt');
-const QT_VERSION = '6.4.1';
+const QT_VERSION = '5.14.1';
 const MIRROR = Boolean(process.env.QT_LINK_MIRROR) ? process.env.QT_LINK_MIRROR : 'https://download.qt.io';

 const checkIfExists = (fullPath) => {
@ -13,46 +13,60 @@ const checkIfExists = (fullPath) => {
 function getMiniQtConfig() {
    switch (os.platform()) {
        case 'darwin': {
-            const qtHome = path.resolve(SETUP_DIR, QT_VERSION, 'macos');
-            return {
-                qtHome,
-                artifacts: [
-                    {
-                        name: 'Qt Base',
-                        link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt6_641/qt.qt6.641.clang_64/6.4.1-0-202211101256qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'plugins', 'platforms', 'libqcocoa.dylib')),
-                    },
-                    {
-                        name: 'Qt Svg',
-                        link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt6_641/qt.qt6.641.clang_64/6.4.1-0-202211101256qtsvg-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'lib', 'QtSvg.framework', 'QtSvg')),
-                    },
-                    {
-                        name: 'Qt Tools',
-                        link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt6_641/qt.qt6.641.clang_64/6.4.1-0-202211101256qttools-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'macdeployqt')),
-                    },
-                ],
-            };
+            if (os.arch() === 'arm64') {
+                const qtHome = path.resolve(SETUP_DIR, 'Qt-5.15.3');
+                return {
+                    qtHome,
+                    artifacts: [
+                        {
+                            name: 'Mini Qt Bundle',
+                            link: `https://github.com/nodegui/nodegui/releases/download/miniQtm1-5153/Qt-5.15.3.zip`,
+                            skipSetup: checkIfExists(path.resolve(qtHome, 'plugins', 'platforms', 'libqcocoa.dylib')),
+                        },
+                    ],
+                };
+            } else {
+                const qtHome = path.resolve(SETUP_DIR, QT_VERSION, 'clang_64');
+                return {
+                    qtHome,
+                    artifacts: [
+                        {
+                            name: 'Qt Base',
+                            link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt5_5141/qt.qt5.5141.clang_64/5.14.1-0-202001241000qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`,
+                            skipSetup: checkIfExists(path.resolve(qtHome, 'plugins', 'platforms', 'libqcocoa.dylib')),
+                        },
+                        {
+                            name: 'Qt Svg',
+                            link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt5_5141/qt.qt5.5141.clang_64/5.14.1-0-202001241000qtsvg-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`,
+                            skipSetup: checkIfExists(path.resolve(qtHome, 'lib', 'QtSvg.framework', 'QtSvg')),
+                        },
+                        {
+                            name: 'Qt Tools',
+                            link: `${MIRROR}/online/qtsdkrepository/mac_x64/desktop/qt5_5141/qt.qt5.5141.clang_64/5.14.1-0-202001241000qttools-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z`,
+                            skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'macdeployqt')),
+                        },
+                    ],
+                };
+            }
        }
        case 'win32': {
-            const qtHome = path.resolve(SETUP_DIR, QT_VERSION, 'msvc2019_64');
+            const qtHome = path.resolve(SETUP_DIR, QT_VERSION, 'msvc2017_64');
            return {
                qtHome,
                artifacts: [
                    {
                        name: 'Qt Base',
-                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt6_641/qt.qt6.641.win64_msvc2019_64/6.4.1-0-202211101254qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'Qt6Core.dll')),
+                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt5_5141/qt.qt5.5141.win64_msvc2017_64/5.14.1-0-202001240957qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`,
+                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'Qt5Core.dll')),
                    },
                    {
                        name: 'Qt SVG',
-                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt6_641/qt.qt6.641.win64_msvc2019_64/6.4.1-0-202211101254qtsvg-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'Qt6Svg.dll')),
+                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt5_5141/qt.qt5.5141.win64_msvc2017_64/5.14.1-0-202001240957qtsvg-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`,
+                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'Qt5Svg.dll')),
                    },
                    {
                        name: 'Qt Tools',
-                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt6_641/qt.qt6.641.win64_msvc2019_64/6.4.1-0-202211101254qttools-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z`,
+                        link: `${MIRROR}/online/qtsdkrepository/windows_x86/desktop/qt5_5141/qt.qt5.5141.win64_msvc2017_64/5.14.1-0-202001240957qttools-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z`,
                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'windeployqt.exe')),
                    },
                ],
@ -65,17 +79,17 @@ function getMiniQtConfig() {
                artifacts: [
                    {
                        name: 'Qt Base',
-                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt6_641/qt.qt6.641.gcc_64/6.4.1-0-202211101305qtbase-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z`,
+                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt5_5141/qt.qt5.5141.gcc_64/5.14.1-0-202001240953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z`,
                        skipSetup: checkIfExists(path.resolve(qtHome, 'bin', 'moc')),
                    },
                    {
                        name: 'Qt SVG',
-                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt6_641/qt.qt6.641.gcc_64/6.4.1-0-202211101305qtsvg-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z`,
-                        skipSetup: checkIfExists(path.resolve(qtHome, 'lib', 'libQt6Svg.so')),
+                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt5_5141/qt.qt5.5141.gcc_64/5.14.1-0-202001240953qtsvg-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z`,
+                        skipSetup: checkIfExists(path.resolve(qtHome, 'lib', 'libQt5Svg.so')),
                    },
                    {
                        name: 'Qt ICU',
-                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt6_641/qt.qt6.641.gcc_64/6.4.1-0-202211101305icu-linux-Rhel7.2-x64.7z`,
+                        link: `${MIRROR}/online/qtsdkrepository/linux_x64/desktop/qt5_5141/qt.qt5.5141.gcc_64/5.14.1-0-202001240953icu-linux-Rhel7.2-x64.7z`,
                        skipSetup: checkIfExists(path.resolve(qtHome, 'lib', 'libicuuc.so')),
                    },
                ],
@ -92,7 +106,7 @@ const miniQt = {

 const useCustomQt = Boolean(process.env.QT_INSTALL_DIR);
 const qtHome = useCustomQt ? process.env.QT_INSTALL_DIR : miniQt.qtHome;
-const qtCmakeDir = path.resolve(qtHome, 'lib', 'cmake', 'Qt6');
+const qtCmakeDir = path.resolve(qtHome, 'lib', 'cmake', 'Qt5');

 module.exports = {
    qtHome,
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "@nodegui/nodegui",
-    "version": "0.59.0",
+    "version": "0.44.2",
    "description": "A cross-platform library to build native desktop apps.",
    "main": "dist/index.js",
    "typings": "dist/index.d.ts",
@ -14,19 +14,17 @@
        "url": "https://github.com/sponsors/a7ul"
    },
    "scripts": {
-        "dev": "npm run build && node ./scripts/qode.js dist/demo.js",
-        "demo": "node ./scripts/qode.js dist/demo.js",
-        "build": "tsc && npm run build:addon",
-        "install": "npm run setupqt && (node ./scripts/skip.js || npm run setupbinary || npm run build:addon)",
-        "setupqt": "node ./scripts/setupMiniQt.js",
-        "setupbinary": "node ./scripts/setupBinary.js",
+        "dev": "cross-env npm run build && node ./scripts/qode.js dist/demo.js",
+        "build": "cross-env tsc && npm run build:addon",
+        "install": "cross-env npm run setupqt && (node ./scripts/skip.js || npm run build:addon)",
+        "setupqt": "cross-env node ./scripts/setupMiniQt.js",
        "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile",
        "test": "node ./scripts/qode.js ./node_modules/jest/bin/jest -i",
-        "lint:cpp": "clang-format -i --glob=src/cpp/**/*.[h,c]*",
-        "lint:ts": "tsc --noEmit && eslint ./src --fix",
-        "docs": "typedoc && node ./website/docs/scripts/fixdocs.js",
-        "qode": "node ./scripts/qode.js",
-        "prepublishOnly": "npm run build"
+        "lint:cpp": "cross-env clang-format -i --glob=src/cpp/**/*.[h,c]*",
+        "lint:ts": "cross-env tsc --noEmit && cross-env eslint './src/**/*.{ts,tsx,js,jsx}' --fix",
+        "docs": "cross-env typedoc && node ./website/docs/scripts/fixdocs.js",
+        "qode": "cross-env node ./scripts/qode.js",
+        "prepublishOnly": "cross-env npm run build"
    },
    "engines": {
        "node": ">=14.x.x"
@ -34,7 +32,7 @@
    "engineStrict": false,
    "dependencies": {
        "@nodegui/artifact-installer": "^1.1.0",
-        "@nodegui/qode": "^18.12.1",
+        "@nodegui/qode": "^16.4.0",
        "cmake-js": "^6.2.1",
        "cross-env": "^7.0.3",
        "cuid": "^2.1.8",
@ -42,25 +40,24 @@
        "memoize-one": "^5.2.1",
        "node-addon-api": "^4.0.0",
        "postcss": "^7.0.17",
-        "postcss-nodegui-autoprefixer": "0.0.7",
-        "tar": "^6.0.1"
+        "postcss-nodegui-autoprefixer": "0.0.7"
    },
    "devDependencies": {
        "@types/bindings": "^1.5.1",
-        "@types/jest": "29.2.4",
+        "@types/jest": "^26.0.24",
        "@types/node": "^16.4.13",
        "@typescript-eslint/eslint-plugin": "^4.29.0",
        "@typescript-eslint/parser": "^4.29.0",
        "clang-format": "^1.5.0",
+        "typedoc": "^0.17.8",
+        "typedoc-plugin-markdown": "^2.4.2",
        "eslint": "^7.32.0",
        "eslint-config-prettier": "^8.3.0",
        "eslint-plugin-prettier": "^3.4.0",
        "husky": "^7.0.1",
-        "jest": "29.3.1",
+        "jest": "^27.0.6",
        "prettier": "^2.3.2",
-        "ts-jest": "29.0.3",
-        "typedoc": "^0.17.8",
-        "typedoc-plugin-markdown": "^2.4.2",
+        "ts-jest": "^27.0.4",
        "typescript": "^4.3.5"
    },
    "binary": {
--- a/scripts/qode.js
+++ b/scripts/qode.js
@ -1,6 +1,5 @@
 #!/usr/bin/env node

-var os = require('os');
 var path = require('path');
 var qodeConfig = require('@nodegui/qode');
 var managePath = require('manage-path');
@ -12,12 +11,6 @@ var proc = require('child_process');
 var alterPath = managePath(process.env);
 alterPath.unshift(path.join(qtConfig.qtHome, 'bin'));

-// Add Qt's lib to LD_LIBRARY_PATH so linux can find the libs when bundled with webpack
-if(os.platform == 'linux') {
-    var oldLD_PATH = process.env.LD_LIBRARY_PATH ?? "";
-    process.env.LD_LIBRARY_PATH = oldLD_PATH + ":" + path.join(qtConfig.qtHome, 'lib');
-}
-
 var child = proc.spawn(qodeConfig.qodePath, process.argv.slice(2), {
    stdio: 'inherit',
    windowsHide: false,
--- a/scripts/setupBinary.js
+++ b/scripts/setupBinary.js
@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const { setupArtifact } = require('@nodegui/artifact-installer');
-const tar = require('tar');
-const SETUP_DIR = path.resolve(__dirname, '..', 'build', 'Release');
-const packageJson = require('../package');
-
-async function setupBinary() {
-    const packageVersion = packageJson.version;
-    const tarballName = `nodegui-binary-v${packageVersion}-${os.platform()}-${os.arch()}.tar.gz`;
-    const url = `https://github.com/nodegui/nodegui/releases/download/v${packageVersion}/${tarballName}`;
-
-    await setupArtifact({
-        outDir: SETUP_DIR,
-        id: 'nodegui-core',
-        displayName: `Precompiled NodeGui binary`,
-        downloadLink: url,
-        skipSetup: () => false,
-    });
-    const tarPath = path.join(SETUP_DIR, tarballName.slice(0, -3));
-    tar.extract({
-        cwd: SETUP_DIR,
-        file: tarPath,
-        sync: true,
-    });
-    fs.unlinkSync(tarPath);
-}
-
-setupBinary()
-    .catch((err) => {
-        console.error(err);
-        process.exit(1);
-    })
-    .then(() => {
-        process.exit(0);
-    });
--- a/src/cpp/include/nodegui/Extras/Utils/nutils.h
+++ b/src/cpp/include/nodegui/Extras/Utils/nutils.h
@ -13,7 +13,8 @@ namespace extrautils {
 DLL_EXPORT QVariant* convertToQVariant(Napi::Env& env, Napi::Value& value);
 DLL_EXPORT bool isNapiValueInt(Napi::Env& env, Napi::Value& num);
 DLL_EXPORT std::string getNapiObjectClassName(Napi::Object& object);
-DLL_EXPORT void* configureQWidget(QWidget* widget, bool isLeafNode = false);
+DLL_EXPORT void* configureQWidget(QWidget* widget, YGNodeRef node,
+                                  bool isLeafNode = false);
 DLL_EXPORT void* configureQObject(QObject* object);
 DLL_EXPORT void* configureComponent(void* component);
 DLL_EXPORT uint64_t hashPointerTo53bit(const void* input);
--- a/src/cpp/include/nodegui/QtCore/QAbstractItemModel/nabstractitemmodel.hpp
+++ b/src/cpp/include/nodegui/QtCore/QAbstractItemModel/nabstractitemmodel.hpp
@ -35,8 +35,6 @@ class DLL_EXPORT NAbstractItemModel : public QAbstractItemModel,
    return *newIndex;
  }

-  QObject* parent() const { return nullptr; }
-
  QModelIndex parent(const QModelIndex& child) const override {
    Napi::Env env = this->dispatchOnNode.Env();
    Napi::HandleScope scope(env);
--- a/src/cpp/include/nodegui/QtCore/QItemSelectionModel/qitemselectionmodel_wrap.h
+++ b/src/cpp/include/nodegui/QtCore/QItemSelectionModel/qitemselectionmodel_wrap.h
@ -14,6 +14,7 @@ class DLL_EXPORT QItemSelectionModelWrap

 private:
  QPointer<QItemSelectionModel> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
--- a/src/cpp/include/nodegui/QtCore/QMimeData/qmimedata_wrap.h
+++ b/src/cpp/include/nodegui/QtCore/QMimeData/qmimedata_wrap.h
@ -5,13 +5,13 @@
 #include <QMimeData>

 #include "Extras/Export/export.h"
-#include "QtCore/QObject/qobject_macro.h"
+#include "core/Component/component_macro.h"

 class DLL_EXPORT QMimeDataWrap : public Napi::ObjectWrap<QMimeDataWrap> {
-  QOBJECT_WRAPPED_METHODS_DECLARATION
+  COMPONENT_WRAPPED_METHODS_DECLARATION

 private:
-  QPointer<QMimeData> instance;
+  std::unique_ptr<QMimeData> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
--- a/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h
+++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_macro.h
@ -5,12 +5,11 @@
 #include "Extras/Utils/nutils.h"
 #include "QtCore/QVariant/qvariant_wrap.h"
 #include "core/Events/eventwidget_macro.h"
-#include "core/WrapperCache/wrappercache.h"
-
 /*
-  This macro adds common QObject exported methods
-  The exported methods are taken into this macro to avoid writing them in each
-  and every widget we export.
+
+    This macro adds common QObject exported methods
+    The exported methods are taken into this macro to avoid writing them in each
+   and every widget we export.
 */

 #ifndef QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE
@ -21,8 +20,7 @@
  Napi::Value __id__(const Napi::CallbackInfo& info) {                       \
    Napi::Env env = info.Env();                                              \
    return Napi::Value::From(                                                \
-        env, extrautils::hashPointerTo53bit(                                 \
-                 static_cast<QObject*>(this->instance.data())));             \
+        env, extrautils::hashPointerTo53bit(this->instance.data()));         \
  }                                                                          \
  Napi::Value inherits(const Napi::CallbackInfo& info) {                     \
    Napi::Env env = info.Env();                                              \
@ -76,49 +74,6 @@
    Napi::Env env = info.Env();                                              \
    return Napi::External<QObject>::New(                                     \
        env, static_cast<QObject*>(this->instance));                         \
-  }                                                                          \
-  Napi::Value startTimer(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                              \
-    int interval = info[0].As<Napi::Number>().Int32Value();                  \
-    Qt::TimerType timerType =                                                \
-        static_cast<Qt::TimerType>(info[1].As<Napi::Number>().Int32Value()); \
-    int result = this->instance->startTimer(interval, timerType);            \
-    return Napi::Value::From(env, result);                                   \
-  }                                                                          \
-  Napi::Value killTimer(const Napi::CallbackInfo& info) {                    \
-    Napi::Env env = info.Env();                                              \
-    int id = info[0].As<Napi::Number>().Int32Value();                        \
-    this->instance->killTimer(id);                                           \
-    return env.Null();                                                       \
-  }                                                                          \
-  Napi::Value parent(const Napi::CallbackInfo& info) {                       \
-    Napi::Env env = info.Env();                                              \
-    QObject* parent = this->instance->parent();                              \
-    if (parent) {                                                            \
-      return WrapperCache::instance.getWrapper(env, parent);                 \
-    } else {                                                                 \
-      return env.Null();                                                     \
-    }                                                                        \
-  }                                                                          \
-  Napi::Value deleteLater(const Napi::CallbackInfo& info) {                  \
-    Napi::Env env = info.Env();                                              \
-    this->instance->deleteLater();                                           \
-    return env.Null();                                                       \
-  }                                                                          \
-  Napi::Value deleteObject(const Napi::CallbackInfo& info) {                 \
-    Napi::Env env = info.Env();                                              \
-    delete static_cast<QObject*>(this->instance);                            \
-    return env.Null();                                                       \
-  }                                                                          \
-  Napi::Value children(const Napi::CallbackInfo& info) {                     \
-    Napi::Env env = info.Env();                                              \
-    QObjectList children = this->instance->children();                       \
-    Napi::Array resultArrayNapi = Napi::Array::New(env, children.size());    \
-    for (int i = 0; i < children.size(); i++) {                              \
-      resultArrayNapi[i] =                                                   \
-          WrapperCache::instance.getWrapper(env, children[i]);               \
-    }                                                                        \
-    return resultArrayNapi;                                                  \
  }

 // Ideally this macro below should go in
@ -160,13 +115,7 @@
      InstanceMethod("objectName", &ComponentWrapName::objectName),         \
      InstanceMethod("dumpObjectTree", &ComponentWrapName::dumpObjectTree), \
      InstanceMethod("dumpObjectInfo", &ComponentWrapName::dumpObjectInfo), \
-      InstanceMethod("setParent", &ComponentWrapName::setParent),           \
-      InstanceMethod("startTimer", &ComponentWrapName::startTimer),         \
-      InstanceMethod("killTimer", &ComponentWrapName::killTimer),           \
-      InstanceMethod("parent", &ComponentWrapName::parent),                 \
-      InstanceMethod("deleteLater", &ComponentWrapName::deleteLater),       \
-      InstanceMethod("delete", &ComponentWrapName::deleteObject),           \
-      InstanceMethod("children", &ComponentWrapName::children),
+      InstanceMethod("setParent", &ComponentWrapName::setParent),

 #endif  // QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE

@ -186,22 +135,4 @@
 #define QOBJECT_SIGNALS QOBJECT_SIGNALS_ON_TARGET(this)
 #endif  // QOBJECT_SIGNALS

-/*
-  Macro to register a function to wrap QObject pointers of a
-  given subclass to wrapper instances. First parameter is the
-  plain name of the QObject subclass (no quotes), seconds is the
-  name of the wrapper class.
- */
-#ifndef QOBJECT_REGISTER_WRAPPER
-#define QOBJECT_REGISTER_WRAPPER(qobjectType, ComponentWrapName)         \
-  WrapperCache::instance.registerWrapper(                                \
-      QString(#qobjectType),                                             \
-      [](Napi::Env env, QObject* qobject) -> Napi::Object {              \
-        qobjectType* exactQObject = dynamic_cast<qobjectType*>(qobject); \
-        Napi::Object wrapper = ComponentWrapName::constructor.New(       \
-            {Napi::External<QObject>::New(env, exactQObject)});          \
-        return wrapper;                                                  \
-      });
-#endif  // QOBJECT_REGISTER_WRAPPER
-
 #include "QtCore/QObject/qobject_wrap.h"
--- a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h
+++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h
@ -11,15 +11,14 @@
 class DLL_EXPORT QObjectWrap : public Napi::ObjectWrap<QObjectWrap> {
  QOBJECT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QObject> instance;
+  QPointer<NObject> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QObjectWrap(const Napi::CallbackInfo& info);
  ~QObjectWrap();
-  QObject* getInternalInstance();
+  NObject* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
-  static Napi::Object wrapFunc(Napi::Env env, QObject* qobject);
  // wrapped methods
 };
--- a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h
+++ b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h
@ -19,18 +19,9 @@ class DLL_EXPORT QSizeWrap : public Napi::ObjectWrap<QSizeWrap> {
  ~QSizeWrap();
  QSize* getInternalInstance();
  // Wrapped methods
-  Napi::Value boundedTo(const Napi::CallbackInfo& info);
-  Napi::Value expandedTo(const Napi::CallbackInfo& info);
-  Napi::Value height(const Napi::CallbackInfo& info);
-  Napi::Value isEmpty(const Napi::CallbackInfo& info);
-  Napi::Value isNull(const Napi::CallbackInfo& info);
-  Napi::Value isValid(const Napi::CallbackInfo& info);
-  Napi::Value scale(const Napi::CallbackInfo& info);
-  Napi::Value scaled(const Napi::CallbackInfo& info);
  Napi::Value setHeight(const Napi::CallbackInfo& info);
  Napi::Value setWidth(const Napi::CallbackInfo& info);
-  Napi::Value transpose(const Napi::CallbackInfo& info);
-  Napi::Value transposed(const Napi::CallbackInfo& info);
+  Napi::Value height(const Napi::CallbackInfo& info);
  Napi::Value width(const Napi::CallbackInfo& info);
 };

--- a/src/cpp/include/nodegui/QtCore/QSizeF/qsizef_wrap.h
+++ b/src/cpp/include/nodegui/QtCore/QSizeF/qsizef_wrap.h
@ -19,19 +19,9 @@ class DLL_EXPORT QSizeFWrap : public Napi::ObjectWrap<QSizeFWrap> {
  ~QSizeFWrap();
  QSizeF* getInternalInstance();
  // Wrapped methods
-  Napi::Value boundedTo(const Napi::CallbackInfo& info);
-  Napi::Value expandedTo(const Napi::CallbackInfo& info);
-  Napi::Value height(const Napi::CallbackInfo& info);
-  Napi::Value isEmpty(const Napi::CallbackInfo& info);
-  Napi::Value isNull(const Napi::CallbackInfo& info);
-  Napi::Value isValid(const Napi::CallbackInfo& info);
-  Napi::Value scale(const Napi::CallbackInfo& info);
-  Napi::Value scaled(const Napi::CallbackInfo& info);
  Napi::Value setHeight(const Napi::CallbackInfo& info);
  Napi::Value setWidth(const Napi::CallbackInfo& info);
-  Napi::Value toSize(const Napi::CallbackInfo& info);
-  Napi::Value transpose(const Napi::CallbackInfo& info);
-  Napi::Value transposed(const Napi::CallbackInfo& info);
+  Napi::Value height(const Napi::CallbackInfo& info);
  Napi::Value width(const Napi::CallbackInfo& info);
 };

--- a/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp
+++ b/src/cpp/include/nodegui/QtGui/QApplication/napplication.hpp
@ -18,14 +18,6 @@ class DLL_EXPORT NApplication : public QApplication, public EventWidget {
    // Qt Connects: Implement all signal connects here
    QOBJECT_SIGNALS

-    QObject::connect(
-        this, &QGuiApplication::applicationDisplayNameChanged, [=]() {
-          Napi::Env env = this->emitOnNode.Env();
-          Napi::HandleScope scope(env);
-          this->emitOnNode.Call(
-              {Napi::String::New(env, "applicationDisplayNameChanged")});
-        });
-
    QObject::connect(
        this, &QGuiApplication::focusWindowChanged, [=](QWindow* focusWindow) {
          Napi::Env env = this->emitOnNode.Env();
@ -33,17 +25,12 @@ class DLL_EXPORT NApplication : public QApplication, public EventWidget {
          this->emitOnNode.Call({Napi::String::New(env, "focusWindowChanged")});
        });

-    QObject::connect(this, &QGuiApplication::lastWindowClosed, [=]() {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call({Napi::String::New(env, "lastWindowClosed")});
-    });
-
    QObject::connect(
        this, &QGuiApplication::primaryScreenChanged, [=](QScreen* screen) {
          Napi::Env env = this->emitOnNode.Env();
          Napi::HandleScope scope(env);
-          auto instance = WrapperCache::instance.getWrapper(env, screen, true);
+          auto instance =
+              WrapperCache::instance.get<QScreen, QScreenWrap>(env, screen);
          this->emitOnNode.Call(
              {Napi::String::New(env, "primaryScreenChanged"), instance});
        });
@ -51,7 +38,8 @@ class DLL_EXPORT NApplication : public QApplication, public EventWidget {
    QObject::connect(this, &QGuiApplication::screenAdded, [=](QScreen* screen) {
      Napi::Env env = this->emitOnNode.Env();
      Napi::HandleScope scope(env);
-      auto instance = WrapperCache::instance.getWrapper(env, screen, true);
+      auto instance =
+          WrapperCache::instance.get<QScreen, QScreenWrap>(env, screen);
      this->emitOnNode.Call({Napi::String::New(env, "screenAdded"), instance});
    });

@ -59,7 +47,8 @@ class DLL_EXPORT NApplication : public QApplication, public EventWidget {
        this, &QGuiApplication::screenRemoved, [=](QScreen* screen) {
          Napi::Env env = this->emitOnNode.Env();
          Napi::HandleScope scope(env);
-          auto instance = WrapperCache::instance.getWrapper(env, screen, true);
+          auto instance =
+              WrapperCache::instance.get<QScreen, QScreenWrap>(env, screen);
          this->emitOnNode.Call(
              {Napi::String::New(env, "screenRemoved"), instance});
        });
--- a/src/cpp/include/nodegui/QtGui/QDrag/qdrag_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QDrag/qdrag_wrap.h
@ -22,13 +22,13 @@ class DLL_EXPORT QDragWrap : public Napi::ObjectWrap<QDragWrap> {
  // except that it is automatically cleared when the referenced object is
  // destroyed (unlike normal C++ pointers, which become "dangling pointers" in
  // such cases). T must be a subclass of QObject.
-  QPointer<QDrag> instance;
+  QPointer<NDrag> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDragWrap(const Napi::CallbackInfo& info);
  ~QDragWrap();
-  QDrag* getInternalInstance();
+  NDrag* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;

--- a/src/cpp/include/nodegui/QtGui/QEvent/QInputMethodEvent/qinputmethodevent_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QEvent/QInputMethodEvent/qinputmethodevent_wrap.h
@ -1,32 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-#include <QInputMethodEvent>
-
-#include "Extras/Export/export.h"
-#include "QtGui/QEvent/QEvent/qevent_macro.h"
-#include "core/Component/component_macro.h"
-
-class DLL_EXPORT QInputMethodEventWrap
-    : public Napi::ObjectWrap<QInputMethodEventWrap> {
-  COMPONENT_WRAPPED_METHODS_DECLARATION
-  QEVENT_WRAPPED_METHODS_DECLARATION
-
- private:
-  QInputMethodEvent* instance;
-
- public:
-  static Napi::Object init(Napi::Env env, Napi::Object exports);
-  QInputMethodEventWrap(const Napi::CallbackInfo& info);
-  ~QInputMethodEventWrap();
-  QInputMethodEvent* getInternalInstance();
-  // class constructor
-  static Napi::FunctionReference constructor;
-  // wrapped methods
-  Napi::Value commitString(const Napi::CallbackInfo& info);
-  Napi::Value preeditString(const Napi::CallbackInfo& info);
-  Napi::Value replacementLength(const Napi::CallbackInfo& info);
-  Napi::Value replacementStart(const Napi::CallbackInfo& info);
-  Napi::Value setCommitString(const Napi::CallbackInfo& info);
-};
--- a/src/cpp/include/nodegui/QtGui/QEvent/QInputMethodQueryEvent/qinputmethodqueryevent_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QEvent/QInputMethodQueryEvent/qinputmethodqueryevent_wrap.h
@ -1,30 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-#include <QInputMethodQueryEvent>
-
-#include "Extras/Export/export.h"
-#include "QtGui/QEvent/QEvent/qevent_macro.h"
-#include "core/Component/component_macro.h"
-
-class DLL_EXPORT QInputMethodQueryEventWrap
-    : public Napi::ObjectWrap<QInputMethodQueryEventWrap> {
-  COMPONENT_WRAPPED_METHODS_DECLARATION
-  QEVENT_WRAPPED_METHODS_DECLARATION
-
- private:
-  QInputMethodQueryEvent* instance;
-
- public:
-  static Napi::Object init(Napi::Env env, Napi::Object exports);
-  QInputMethodQueryEventWrap(const Napi::CallbackInfo& info);
-  ~QInputMethodQueryEventWrap();
-  QInputMethodQueryEvent* getInternalInstance();
-  // class constructor
-  static Napi::FunctionReference constructor;
-  // wrapped methods
-  Napi::Value queries(const Napi::CallbackInfo& info);
-  Napi::Value setValue(const Napi::CallbackInfo& info);
-  Napi::Value value(const Napi::CallbackInfo& info);
-};
--- a/src/cpp/include/nodegui/QtGui/QEvent/QMoveEvent/qmoveevent_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QEvent/QMoveEvent/qmoveevent_wrap.h
@ -1,28 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-#include <QMoveEvent>
-
-#include "Extras/Export/export.h"
-#include "QtGui/QEvent/QEvent/qevent_macro.h"
-#include "core/Component/component_macro.h"
-
-class DLL_EXPORT QMoveEventWrap : public Napi::ObjectWrap<QMoveEventWrap> {
-  COMPONENT_WRAPPED_METHODS_DECLARATION
-  QEVENT_WRAPPED_METHODS_DECLARATION
-
- private:
-  QMoveEvent* instance;
-
- public:
-  static Napi::Object init(Napi::Env env, Napi::Object exports);
-  QMoveEventWrap(const Napi::CallbackInfo& info);
-  ~QMoveEventWrap();
-  QMoveEvent* getInternalInstance();
-  // class constructor
-  static Napi::FunctionReference constructor;
-  // wrapped methods
-  Napi::Value oldPos(const Napi::CallbackInfo& info);
-  Napi::Value pos(const Napi::CallbackInfo& info);
-};
--- a/src/cpp/include/nodegui/QtGui/QEvent/QTimerEvent/qtimerevent_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QEvent/QTimerEvent/qtimerevent_wrap.h
@ -1,27 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-#include <QTimerEvent>
-
-#include "Extras/Export/export.h"
-#include "QtGui/QEvent/QEvent/qevent_macro.h"
-#include "core/Component/component_macro.h"
-
-class DLL_EXPORT QTimerEventWrap : public Napi::ObjectWrap<QTimerEventWrap> {
-  COMPONENT_WRAPPED_METHODS_DECLARATION
-  QEVENT_WRAPPED_METHODS_DECLARATION
-
- private:
-  QTimerEvent* instance;
-
- public:
-  static Napi::Object init(Napi::Env env, Napi::Object exports);
-  QTimerEventWrap(const Napi::CallbackInfo& info);
-  ~QTimerEventWrap();
-  QTimerEvent* getInternalInstance();
-  // class constructor
-  static Napi::FunctionReference constructor;
-  // wrapped methods
-  Napi::Value timerId(const Napi::CallbackInfo& info);
-};
--- a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h
@ -20,18 +20,10 @@ class DLL_EXPORT QIconWrap : public Napi::ObjectWrap<QIconWrap> {
  ~QIconWrap();
  QIcon* getInternalInstance();
  // Wrapped methods
-  Napi::Value actualSize(const Napi::CallbackInfo& info);
-  Napi::Value addFile(const Napi::CallbackInfo& info);
-  Napi::Value addPixmap(const Napi::CallbackInfo& info);
-  Napi::Value availableSizes(const Napi::CallbackInfo& info);
  Napi::Value pixmap(const Napi::CallbackInfo& info);
  Napi::Value isMask(const Napi::CallbackInfo& info);
-  Napi::Value isNull(const Napi::CallbackInfo& info);
-  Napi::Value name(const Napi::CallbackInfo& info);
-  Napi::Value paint(const Napi::CallbackInfo& info);
  Napi::Value setIsMask(const Napi::CallbackInfo& info);
  Napi::Value cacheKey(const Napi::CallbackInfo& info);
-  Napi::Value swap(const Napi::CallbackInfo& info);
 };

 namespace StaticQIconWrapMethods {
--- a/src/cpp/include/nodegui/QtGui/QScreen/qscreen_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QScreen/qscreen_wrap.h
@ -30,5 +30,4 @@ class DLL_EXPORT QScreenWrap : public Napi::ObjectWrap<QScreenWrap>,
  virtual void connectSignalsToEventEmitter();

  // Wrapped methods
-  Napi::Value grabWindow(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtGui/QWindow/qwindow_wrap.h
+++ b/src/cpp/include/nodegui/QtGui/QWindow/qwindow_wrap.h
@ -9,8 +9,7 @@
 #include "QtCore/QObject/qobject_macro.h"

 class DLL_EXPORT QWindowWrap : public Napi::ObjectWrap<QWindowWrap>,
-                               public EventWidget,
-                               public QObject {
+                               public EventWidget {
  QOBJECT_WRAPPED_METHODS_DECLARATION_WITH_EVENT_SOURCE(this)
  // Note: We don't use EVENTWIDGET_IMPLEMENTATIONS() here because this class
  // doesn't handle any QEvents.
@ -35,24 +34,10 @@ class DLL_EXPORT QWindowWrap : public Napi::ObjectWrap<QWindowWrap>,

  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QWindowWrap(const Napi::CallbackInfo& info);
-  ~QWindowWrap();
  QWindow* getInternalInstance();

  virtual void connectSignalsToEventEmitter();

  // wrapped methods
  Napi::Value screen(const Napi::CallbackInfo& info);
-  Napi::Value showFullScreen(const Napi::CallbackInfo& info);
-  Napi::Value showMaximized(const Napi::CallbackInfo& info);
-  Napi::Value showMinimized(const Napi::CallbackInfo& info);
-  Napi::Value showNormal(const Napi::CallbackInfo& info);
-  Napi::Value startSystemMove(const Napi::CallbackInfo& info);
-  Napi::Value startSystemResize(const Napi::CallbackInfo& info);
-  Napi::Value setWindowState(const Napi::CallbackInfo& info);
-  Napi::Value windowState(const Napi::CallbackInfo& info);
-  Napi::Value visibility(const Napi::CallbackInfo& info);
-  Napi::Value setVisibility(const Napi::CallbackInfo& info);
-
- protected:
-  bool eventFilter(QObject* watched, QEvent* event) override;
 };
--- a/src/cpp/include/nodegui/QtWidgets/QAbstractButton/qabstractbutton_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAbstractButton/qabstractbutton_macro.h
@ -16,7 +16,8 @@
  QWIDGET_WRAPPED_METHODS_DECLARATION                        \
  Napi::Value animateClick(const Napi::CallbackInfo& info) { \
    Napi::Env env = info.Env();                              \
-    this->instance->animateClick();                          \
+    int msec = info[0].As<Napi::Number>().Int32Value();      \
+    this->instance->animateClick(msec);                      \
    return env.Null();                                       \
  }                                                          \
  Napi::Value click(const Napi::CallbackInfo& info) {        \
--- a/src/cpp/include/nodegui/QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_macro.h
@ -1,21 +0,0 @@
-#pragma once
-
-#include "QtCore/QObject/qobject_macro.h"
-
-/*
-    This macro adds common QAbstractItemDelete exported methods
- */
-
-#ifndef QABSTRACTITEMDELEGATE_WRAPPED_METHODS_DECLARATION
-#define QABSTRACTITEMDELEGATE_WRAPPED_METHODS_DECLARATION \
-  QOBJECT_WRAPPED_METHODS_DECLARATION
-#endif
-
-#ifndef QABSTRACTITEMDELEGATE_WRAPPED_METHODS_EXPORT_DEFINE
-#define QABSTRACTITEMDELEGATE_WRAPPED_METHODS_EXPORT_DEFINE(WrapName) \
-  QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(WrapName)
-#endif  // QABSTRACTITEMDELEGATE_WRAPPED_METHODS_EXPORT_DEFINE
-
-#ifndef QABSTRACTITEMDELEGATE_SIGNALS
-#define QABSTRACTITEMDELEGATE_SIGNALS QOBJECT_SIGNALS
-#endif  // QABSTRACTITEMDELEGATE_SIGNALS
--- a/src/cpp/include/nodegui/QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_wrap.h
@ -1,25 +0,0 @@
-#pragma once
-
-#include <napi.h>
-
-#include <QAbstractItemDelegate>
-#include <QPointer>
-
-#include "Extras/Utils/nutils.h"
-#include "QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_macro.h"
-
-class DLL_EXPORT QAbstractItemDelegateWrap
-    : public Napi::ObjectWrap<QAbstractItemDelegateWrap> {
-  QABSTRACTITEMDELEGATE_WRAPPED_METHODS_DECLARATION
- private:
-  QPointer<QAbstractItemDelegate> instance;
-
- public:
-  static Napi::Object init(Napi::Env env, Napi::Object exports);
-  QAbstractItemDelegateWrap(const Napi::CallbackInfo& info);
-  ~QAbstractItemDelegateWrap();
-  QAbstractItemDelegate* getInternalInstance();
-  // class constructor
-  static Napi::FunctionReference constructor;
-  // wrapped methods
-};
--- a/src/cpp/include/nodegui/QtWidgets/QAbstractItemView/qabstractitemview_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAbstractItemView/qabstractitemview_macro.h
@ -3,7 +3,6 @@
 #include "QtCore/QAbstractItemModel/qabstractitemmodel_wrap.h"
 #include "QtCore/QItemSelectionModel/qitemselectionmodel_wrap.h"
 #include "QtCore/QModelIndex/qmodelindex_wrap.h"
-#include "QtWidgets/QAbstractItemDelegate/qabstractitemdelegate_wrap.h"
 #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h"
 #include "QtWidgets/QWidget/qwidget_wrap.h"

@ -146,7 +145,9 @@
  Napi::Value selectionModel(const Napi::CallbackInfo& info) {                 \
    Napi::Env env = info.Env();                                                \
    QItemSelectionModel* model = this->instance->selectionModel();             \
-    return WrapperCache::instance.getWrapper(env, model);                      \
+    auto modelExt = Napi::External<QItemSelectionModel>::New(env, model);      \
+    auto instance = QItemSelectionModelWrap::constructor.New({modelExt});      \
+    return instance;                                                           \
  }                                                                            \
  Napi::Value isPersistentEditorOpen(const Napi::CallbackInfo& info) {         \
    Napi::Env env = info.Env();                                                \
@ -170,57 +171,6 @@
    QString search = QString::fromUtf8(searchNapiText.c_str());                \
    this->instance->keyboardSearch(search);                                    \
    return env.Null();                                                         \
-  }                                                                            \
-  Napi::Value setItemDelegate(const Napi::CallbackInfo& info) {                \
-    Napi::Env env = info.Env();                                                \
-    if (info[0].IsNull()) {                                                    \
-      this->instance->setItemDelegate(nullptr);                                \
-    } else {                                                                   \
-      QAbstractItemDelegateWrap* delegateWrap =                                \
-          Napi::ObjectWrap<QAbstractItemDelegateWrap>::Unwrap(                 \
-              info[0].As<Napi::Object>());                                     \
-      QAbstractItemDelegate* delegate = delegateWrap->getInternalInstance();   \
-      this->instance->setItemDelegate(delegate);                               \
-    }                                                                          \
-    return env.Null();                                                         \
-  }                                                                            \
-  Napi::Value setItemDelegateForColumn(const Napi::CallbackInfo& info) {       \
-    Napi::Env env = info.Env();                                                \
-    int column = info[0].As<Napi::Number>().Int32Value();                      \
-    if (info[1].IsNull()) {                                                    \
-      this->instance->setItemDelegateForColumn(column, nullptr);               \
-    } else {                                                                   \
-      QAbstractItemDelegateWrap* delegateWrap =                                \
-          Napi::ObjectWrap<QAbstractItemDelegateWrap>::Unwrap(                 \
-              info[1].As<Napi::Object>());                                     \
-      QAbstractItemDelegate* delegate = delegateWrap->getInternalInstance();   \
-      this->instance->setItemDelegateForColumn(column, delegate);              \
-    }                                                                          \
-    return env.Null();                                                         \
-  }                                                                            \
-  Napi::Value setItemDelegateForRow(const Napi::CallbackInfo& info) {          \
-    Napi::Env env = info.Env();                                                \
-    int row = info[0].As<Napi::Number>().Int32Value();                         \
-    if (info[1].IsNull()) {                                                    \
-      this->instance->setItemDelegateForRow(row, nullptr);                     \
-    } else {                                                                   \
-      QAbstractItemDelegateWrap* delegateWrap =                                \
-          Napi::ObjectWrap<QAbstractItemDelegateWrap>::Unwrap(                 \
-              info[1].As<Napi::Object>());                                     \
-      QAbstractItemDelegate* delegate = delegateWrap->getInternalInstance();   \
-      this->instance->setItemDelegateForRow(row, delegate);                    \
-    }                                                                          \
-    return env.Null();                                                         \
-  }                                                                            \
-  Napi::Value sizeHintForIndex(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                                \
-    QModelIndexWrap* indexWrap =                                               \
-        Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
-    QModelIndex* index = indexWrap->getInternalInstance();                     \
-    QSize result = this->instance->sizeHintForIndex(*index);                   \
-    auto resultInstance = QSizeWrap::constructor.New(                          \
-        {Napi::External<QSize>::New(env, new QSize(result))});                 \
-    return resultInstance;                                                     \
  }

 #define QABSTRACTITEMVIEW_WRAPPED_METHODS_DECLARATION                          \
@ -245,59 +195,42 @@
            info[1].As<Napi::Number>().Int32Value());                          \
    this->instance->scrollTo(*index, hint);                                    \
    return env.Null();                                                         \
-  }                                                                            \
-  Napi::Value visualRect(const Napi::CallbackInfo& info) {                     \
-    Napi::Env env = info.Env();                                                \
-    QModelIndexWrap* indexWrap =                                               \
-        Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>()); \
-    QModelIndex* index = indexWrap->getInternalInstance();                     \
-    QRect ret = this->instance->visualRect(*index);                            \
-    auto instance = QRectWrap::constructor.New(                                \
-        {Napi::External<QRect>::New(env, new QRect(ret))});                    \
-    return instance;                                                           \
  }

 #endif  // QABSTRACTITEMVIEW_WRAPPED_METHODS_DECLARATION

 #ifndef QABSTRACTITEMVIEW_WRAPPED_METHODS_EXPORT_DEFINE
-#define QABSTRACTITEMVIEW_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)    \
-  QABSTRACTSCROLLAREA_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)        \
-  InstanceMethod("setCurrentIndex", &WidgetWrapName::setCurrentIndex),     \
-      InstanceMethod("currentIndex", &WidgetWrapName::currentIndex),       \
-      InstanceMethod("setIndexWidget", &WidgetWrapName::setIndexWidget),   \
-      InstanceMethod("indexWidget", &WidgetWrapName::indexWidget),         \
-      InstanceMethod("resetHorizontalScrollMode",                          \
-                     &WidgetWrapName::resetHorizontalScrollMode),          \
-      InstanceMethod("resetVerticalScrollMode",                            \
-                     &WidgetWrapName::resetVerticalScrollMode),            \
-      InstanceMethod("rootIndex", &WidgetWrapName::rootIndex),             \
-      InstanceMethod("scrollToBottom", &WidgetWrapName::scrollToBottom),   \
-      InstanceMethod("scrollToTop", &WidgetWrapName::scrollToTop),         \
-      InstanceMethod("setModel", &WidgetWrapName::setModel),               \
-      InstanceMethod("closePersistentEditor",                              \
-                     &WidgetWrapName::closePersistentEditor),              \
-      InstanceMethod("clearSelection", &WidgetWrapName::clearSelection),   \
-      InstanceMethod("edit", &WidgetWrapName::edit),                       \
-      InstanceMethod("reset", &WidgetWrapName::reset),                     \
-      InstanceMethod("selectAll", &WidgetWrapName::selectAll),             \
-      InstanceMethod("setRootIndex", &WidgetWrapName::setRootIndex),       \
-      InstanceMethod("update_QModelIndex",                                 \
-                     &WidgetWrapName::update_QModelIndex),                 \
-      InstanceMethod("indexAt", &WidgetWrapName::indexAt),                 \
-      InstanceMethod("selectionModel", &WidgetWrapName::selectionModel),   \
-      InstanceMethod("scrollTo", &WidgetWrapName::scrollTo),               \
-      InstanceMethod("isPersistentEditorOpen",                             \
-                     &WidgetWrapName::isPersistentEditorOpen),             \
-      InstanceMethod("openPersistentEditor",                               \
-                     &WidgetWrapName::openPersistentEditor),               \
-      InstanceMethod("keyboardSearch", &WidgetWrapName::keyboardSearch),   \
-      InstanceMethod("setItemDelegate", &WidgetWrapName::setItemDelegate), \
-      InstanceMethod("setItemDelegateForColumn",                           \
-                     &WidgetWrapName::setItemDelegateForColumn),           \
-      InstanceMethod("setItemDelegateForRow",                              \
-                     &WidgetWrapName::setItemDelegateForRow),              \
-      InstanceMethod("visualRect", &WidgetWrapName::visualRect),           \
-      InstanceMethod("sizeHintForIndex", &WidgetWrapName::sizeHintForIndex),
+#define QABSTRACTITEMVIEW_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)  \
+  QABSTRACTSCROLLAREA_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)      \
+  InstanceMethod("setCurrentIndex", &WidgetWrapName::setCurrentIndex),   \
+      InstanceMethod("currentIndex", &WidgetWrapName::currentIndex),     \
+      InstanceMethod("setIndexWidget", &WidgetWrapName::setIndexWidget), \
+      InstanceMethod("indexWidget", &WidgetWrapName::indexWidget),       \
+      InstanceMethod("resetHorizontalScrollMode",                        \
+                     &WidgetWrapName::resetHorizontalScrollMode),        \
+      InstanceMethod("resetVerticalScrollMode",                          \
+                     &WidgetWrapName::resetVerticalScrollMode),          \
+      InstanceMethod("rootIndex", &WidgetWrapName::rootIndex),           \
+      InstanceMethod("scrollToBottom", &WidgetWrapName::scrollToBottom), \
+      InstanceMethod("scrollToTop", &WidgetWrapName::scrollToTop),       \
+      InstanceMethod("setModel", &WidgetWrapName::setModel),             \
+      InstanceMethod("closePersistentEditor",                            \
+                     &WidgetWrapName::closePersistentEditor),            \
+      InstanceMethod("clearSelection", &WidgetWrapName::clearSelection), \
+      InstanceMethod("edit", &WidgetWrapName::edit),                     \
+      InstanceMethod("reset", &WidgetWrapName::reset),                   \
+      InstanceMethod("selectAll", &WidgetWrapName::selectAll),           \
+      InstanceMethod("setRootIndex", &WidgetWrapName::setRootIndex),     \
+      InstanceMethod("update_QModelIndex",                               \
+                     &WidgetWrapName::update_QModelIndex),               \
+      InstanceMethod("indexAt", &WidgetWrapName::indexAt),               \
+      InstanceMethod("selectionModel", &WidgetWrapName::selectionModel), \
+      InstanceMethod("scrollTo", &WidgetWrapName::scrollTo),             \
+      InstanceMethod("isPersistentEditorOpen",                           \
+                     &WidgetWrapName::isPersistentEditorOpen),           \
+      InstanceMethod("openPersistentEditor",                             \
+                     &WidgetWrapName::openPersistentEditor),             \
+      InstanceMethod("keyboardSearch", &WidgetWrapName::keyboardSearch),

 #endif  // QABSTRACTITEMVIEW_WRAPPED_METHODS_EXPORT_DEFINE

--- a/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h
@ -58,21 +58,9 @@
  Napi::Value viewport(const Napi::CallbackInfo& info) {               \
    Napi::Env env = info.Env();                                        \
    QWidget* viewPort = this->instance->viewport();                    \
-    auto instance = WrapperCache::instance.getWrapper(env, viewPort);  \
-    return instance;                                                   \
-  }                                                                    \
-                                                                       \
-  Napi::Value horizontalScrollBar(const Napi::CallbackInfo& info) {    \
-    Napi::Env env = info.Env();                                        \
-    QScrollBar* scrollBar = this->instance->horizontalScrollBar();     \
-    auto instance = WrapperCache::instance.getWrapper(env, scrollBar); \
-    return instance;                                                   \
-  }                                                                    \
-                                                                       \
-  Napi::Value verticalScrollBar(const Napi::CallbackInfo& info) {      \
-    Napi::Env env = info.Env();                                        \
-    QScrollBar* scrollBar = this->instance->verticalScrollBar();       \
-    auto instance = WrapperCache::instance.getWrapper(env, scrollBar); \
+    NWidget* nviewPort = reinterpret_cast<NWidget*>(viewPort);         \
+    auto instance = QWidgetWrap::constructor.New(                      \
+        {Napi::External<NWidget>::New(env, nviewPort)});               \
    return instance;                                                   \
  }

@ -89,10 +77,7 @@
      InstanceMethod("setVerticalScrollBar",                                   \
                     &WidgetWrapName::setVerticalScrollBar),                   \
      InstanceMethod("setViewport", &WidgetWrapName::setViewport),             \
-      InstanceMethod("viewport", &WidgetWrapName::viewport),                   \
-      InstanceMethod("horizontalScrollBar",                                    \
-                     &WidgetWrapName::horizontalScrollBar),                    \
-      InstanceMethod("verticalScrollBar", &WidgetWrapName::verticalScrollBar),
+      InstanceMethod("viewport", &WidgetWrapName::viewport),

 #endif  // QABSTRACTSCROLLAREA_WRAPPED_METHODS_EXPORT_DEFINE

--- a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h
@ -11,13 +11,14 @@ class DLL_EXPORT QActionWrap : public Napi::ObjectWrap<QActionWrap> {
  QOBJECT_WRAPPED_METHODS_DECLARATION

 private:
-  QPointer<QAction> instance;
+  QPointer<NAction> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QActionWrap(const Napi::CallbackInfo& info);
  ~QActionWrap();
-  QAction* getInternalInstance();
+  NAction* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QBoxLayoutWrap : public Napi::ObjectWrap<QBoxLayoutWrap> {
  QLAYOUT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QBoxLayout> instance;
+  QPointer<NBoxLayout> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QBoxLayoutWrap(const Napi::CallbackInfo& info);
  ~QBoxLayoutWrap();
-  QBoxLayout* getInternalInstance();
+  NBoxLayout* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp
@ -15,30 +15,12 @@ class DLL_EXPORT NButtonGroup : public QButtonGroup, public EventWidget {
  virtual void connectSignalsToEventEmitter() {
    QOBJECT_SIGNALS
    // Qt Connects: Implement all signal connects here
-    connect(this, &QButtonGroup::idClicked, [=](int id) {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call(
-          {Napi::String::New(env, "idClicked"), Napi::Number::New(env, id)});
-    });
-    connect(this, &QButtonGroup::idPressed, [=](int id) {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call(
-          {Napi::String::New(env, "idPressed"), Napi::Number::New(env, id)});
-    });
-    connect(this, &QButtonGroup::idReleased, [=](int id) {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call(
-          {Napi::String::New(env, "idReleased"), Napi::Number::New(env, id)});
-    });
-    connect(this, &QButtonGroup::idToggled, [=](int id, bool checked) {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call({Napi::String::New(env, "idToggled"),
-                             Napi::Number::New(env, id),
-                             Napi::Boolean::New(env, checked)});
-    });
+    connect(this, QOverload<int>::of(&QButtonGroup::buttonClicked),
+            [=](int id) {
+              Napi::Env env = this->emitOnNode.Env();
+              Napi::HandleScope scope(env);
+              this->emitOnNode.Call({Napi::String::New(env, "buttonClicked"),
+                                     Napi::Number::New(env, id)});
+            });
  }
 };
--- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h
@ -9,13 +9,13 @@
 #include "nbuttongroup.hpp"
 class DLL_EXPORT QButtonGroupWrap : public Napi::ObjectWrap<QButtonGroupWrap> {
 private:
-  QPointer<QButtonGroup> instance;
+  QPointer<NButtonGroup> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QButtonGroupWrap(const Napi::CallbackInfo& info);
  ~QButtonGroupWrap();
-  QButtonGroup* getInternalInstance();
+  NButtonGroup* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QCalendarWidgetWrap
    : public Napi::ObjectWrap<QCalendarWidgetWrap> {
 private:
-  QPointer<QCalendarWidget> instance;
+  QPointer<NCalendarWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QCalendarWidgetWrap(const Napi::CallbackInfo &info);
  ~QCalendarWidgetWrap();
-  QCalendarWidget *getInternalInstance();
+  NCalendarWidget *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h
@ -12,13 +12,14 @@
 class DLL_EXPORT QCheckBoxWrap : public Napi::ObjectWrap<QCheckBoxWrap> {
  QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QCheckBox> instance;
+  QPointer<NCheckBox> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QCheckBoxWrap(const Napi::CallbackInfo& info);
  ~QCheckBoxWrap();
-  QCheckBox* getInternalInstance();
+  NCheckBox* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QColorDialog/qcolordialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QColorDialog/qcolordialog_wrap.h
@ -9,23 +9,21 @@
 #include "QtWidgets/QDialog/qdialog_macro.h"

 class DLL_EXPORT QColorDialogWrap : public Napi::ObjectWrap<QColorDialogWrap> {
-  QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE
+  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QColorDialog> instance;
+  QPointer<NColorDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QColorDialogWrap(const Napi::CallbackInfo& info);
  ~QColorDialogWrap();
-  QColorDialog* getInternalInstance();
+  NColorDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value selectedColor(const Napi::CallbackInfo& info);
  Napi::Value setOption(const Napi::CallbackInfo& info);
  Napi::Value testOption(const Napi::CallbackInfo& info);
-  Napi::Value accept(const Napi::CallbackInfo& info);
-  Napi::Value done(const Napi::CallbackInfo& info);
 };

 namespace StaticQColorDialogWrapMethods {
--- a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QComboBoxWrap : public Napi::ObjectWrap<QComboBoxWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QComboBox> instance;
+  QPointer<NComboBox> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QComboBoxWrap(const Napi::CallbackInfo& info);
  ~QComboBoxWrap();
-  QComboBox* getInternalInstance();
+  NComboBox* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QDateEditWrap : public Napi::ObjectWrap<QDateEditWrap> {
  QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QDateEdit> instance;
+  QPointer<NDateEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDateEditWrap(const Napi::CallbackInfo &info);
  ~QDateEditWrap();
-  QDateEdit *getInternalInstance();
+  NDateEdit *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h
@ -24,24 +24,14 @@
    this->instance->setCalendarWidget(                                       \
        calendarWidgetWrap->getInternalInstance());                          \
    return env.Null();                                                       \
-  }                                                                          \
-  Napi::Value calendarWidget(const Napi::CallbackInfo &info) {               \
-    Napi::Env env = info.Env();                                              \
-    QObject *calendarWidget = this->instance->calendarWidget();              \
-    if (calendarWidget) {                                                    \
-      return WrapperCache::instance.getWrapper(env, calendarWidget);         \
-    } else {                                                                 \
-      return env.Null();                                                     \
-    }                                                                        \
  }

 #endif  // QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION

 #ifndef QDATETIMEEDIT_WRAPPED_METHODS_EXPORT_DEFINE
-#define QDATETIMEEDIT_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)        \
-  QABSTRACTSPINBOX_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)           \
-  InstanceMethod("setCalendarWidget", &WidgetWrapName::setCalendarWidget), \
-      InstanceMethod("calendarWidget", &WidgetWrapName::calendarWidget),
+#define QDATETIMEEDIT_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName) \
+  QABSTRACTSPINBOX_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName)    \
+  InstanceMethod("setCalendarWidget", &WidgetWrapName::setCalendarWidget),

 #endif  // QDATETIMEEDIT_WRAPPED_METHODS_EXPORT_DEFINE

--- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QDateTimeEditWrap
    : public Napi::ObjectWrap<QDateTimeEditWrap> {
  QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QDateTimeEdit> instance;
+  QPointer<NDateTimeEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDateTimeEditWrap(const Napi::CallbackInfo &info);
  ~QDateTimeEditWrap();
-  QDateTimeEdit *getInternalInstance();
+  NDateTimeEdit *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QDialWrap : public Napi::ObjectWrap<QDialWrap> {
  QABSTRACTSLIDER_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QDial> instance;
+  QPointer<NDial> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDialWrap(const Napi::CallbackInfo& info);
  ~QDialWrap();
-  QDial* getInternalInstance();
+  NDial* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_macro.h
@ -10,55 +10,39 @@

    This macro adds common QDialog exported methods
    The exported methods are taken into this macro to avoid writing them in each
-    and every widget we export.
+   and every widget we export.
 */

-#ifndef QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE
-#define QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE \
-                                                              \
-  QWIDGET_WRAPPED_METHODS_DECLARATION                         \
-                                                              \
-  Napi::Value setResult(const Napi::CallbackInfo& info) {     \
-    Napi::Env env = info.Env();                               \
-    Napi::Number result = info[0].As<Napi::Number>();         \
-    this->instance->setResult(result.Int32Value());           \
-    return env.Null();                                        \
-  }                                                           \
-  Napi::Value result(const Napi::CallbackInfo& info) {        \
-    Napi::Env env = info.Env();                               \
-    int value = this->instance->result();                     \
-    return Napi::Value::From(env, value);                     \
-  }                                                           \
-  Napi::Value exec(const Napi::CallbackInfo& info) {          \
-    Napi::Env env = info.Env();                               \
-    int value = static_cast<int>(this->instance->exec());     \
-    return Napi::Number::From(env, value);                    \
-  }                                                           \
-  Napi::Value open(const Napi::CallbackInfo& info) {          \
-    Napi::Env env = info.Env();                               \
-    this->instance->open();                                   \
-    return env.Null();                                        \
-  }                                                           \
-  Napi::Value reject(const Napi::CallbackInfo& info) {        \
-    Napi::Env env = info.Env();                               \
-    this->instance->reject();                                 \
-    return env.Null();                                        \
-  }
-#endif
-
 #ifndef QDIALOG_WRAPPED_METHODS_DECLARATION
-#define QDIALOG_WRAPPED_METHODS_DECLARATION             \
-  QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE \
-  Napi::Value accept(const Napi::CallbackInfo& info) {  \
-    Napi::Env env = info.Env();                         \
-    this->instance->accept();                           \
-    return env.Null();                                  \
-  }                                                     \
-  Napi::Value done(const Napi::CallbackInfo& info) {    \
-    Napi::Env env = info.Env();                         \
-    int r = info[0].As<Napi::Number>().Int32Value();    \
-    this->instance->done(r);                            \
-    return env.Null();                                  \
+#define QDIALOG_WRAPPED_METHODS_DECLARATION               \
+                                                          \
+  QWIDGET_WRAPPED_METHODS_DECLARATION                     \
+                                                          \
+  Napi::Value setResult(const Napi::CallbackInfo& info) { \
+    Napi::Env env = info.Env();                           \
+    Napi::Number result = info[0].As<Napi::Number>();     \
+    this->instance->setResult(result.Int32Value());       \
+    return env.Null();                                    \
+  }                                                       \
+  Napi::Value result(const Napi::CallbackInfo& info) {    \
+    Napi::Env env = info.Env();                           \
+    int value = this->instance->result();                 \
+    return Napi::Value::From(env, value);                 \
+  }                                                       \
+  Napi::Value exec(const Napi::CallbackInfo& info) {      \
+    Napi::Env env = info.Env();                           \
+    int value = static_cast<int>(this->instance->exec()); \
+    return Napi::Number::From(env, value);                \
+  }                                                       \
+  Napi::Value open(const Napi::CallbackInfo& info) {      \
+    Napi::Env env = info.Env();                           \
+    this->instance->open();                               \
+    return env.Null();                                    \
+  }                                                       \
+  Napi::Value reject(const Napi::CallbackInfo& info) {    \
+    Napi::Env env = info.Env();                           \
+    this->instance->reject();                             \
+    return env.Null();                                    \
  }
 #endif

@ -70,9 +54,7 @@
      InstanceMethod("setResult", &DialogWrapName::setResult), \
      InstanceMethod("exec", &DialogWrapName::exec),           \
      InstanceMethod("open", &DialogWrapName::open),           \
-      InstanceMethod("reject", &DialogWrapName::reject),       \
-      InstanceMethod("accept", &DialogWrapName::accept),       \
-      InstanceMethod("done", &DialogWrapName::done),
+      InstanceMethod("reject", &DialogWrapName::reject),

 #endif  // QDIALOG_WRAPPED_METHODS_EXPORT_DEFINE

--- a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QDialogWrap : public Napi::ObjectWrap<QDialogWrap> {
  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QDialog> instance;
+  QPointer<NDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDialogWrap(const Napi::CallbackInfo& info);
  ~QDialogWrap();
-  QDialog* getInternalInstance();
+  NDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QDoubleSpinBox/qdoublespinbox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QDoubleSpinBox/qdoublespinbox_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QDoubleSpinBoxWrap
    : public Napi::ObjectWrap<QDoubleSpinBoxWrap> {
  QABSTRACTSPINBOX_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QDoubleSpinBox> instance;
+  QPointer<NDoubleSpinBox> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QDoubleSpinBoxWrap(const Napi::CallbackInfo& info);
  ~QDoubleSpinBoxWrap();
-  QDoubleSpinBox* getInternalInstance();
+  NDoubleSpinBox* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QErrorMessage/qerrormessage_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QErrorMessage/qerrormessage_wrap.h
@ -10,19 +10,17 @@

 class DLL_EXPORT QErrorMessageWrap
    : public Napi::ObjectWrap<QErrorMessageWrap> {
-  QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE
+  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QErrorMessage> instance;
+  QPointer<NErrorMessage> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QErrorMessageWrap(const Napi::CallbackInfo& info);
  ~QErrorMessageWrap();
-  QErrorMessage* getInternalInstance();
+  NErrorMessage* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value showMessage(const Napi::CallbackInfo& info);
-  Napi::Value accept(const Napi::CallbackInfo& info);
-  Napi::Value done(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h
@ -9,15 +9,15 @@
 #include "QtWidgets/QFileDialog/nfiledialog.hpp"

 class DLL_EXPORT QFileDialogWrap : public Napi::ObjectWrap<QFileDialogWrap> {
-  QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE
+  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QFileDialog> instance;
+  QPointer<NFileDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QFileDialogWrap(const Napi::CallbackInfo& info);
  ~QFileDialogWrap();
-  QFileDialog* getInternalInstance();
+  NFileDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
@ -28,6 +28,4 @@ class DLL_EXPORT QFileDialogWrap : public Napi::ObjectWrap<QFileDialogWrap> {
  Napi::Value setOption(const Napi::CallbackInfo& info);
  Napi::Value setNameFilter(const Napi::CallbackInfo& info);
  Napi::Value selectedFiles(const Napi::CallbackInfo& info);
-  Napi::Value accept(const Napi::CallbackInfo& info);
-  Napi::Value done(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QFontDialog/qfontdialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QFontDialog/qfontdialog_wrap.h
@ -9,21 +9,19 @@
 #include "QtWidgets/QFontDialog/nfontdialog.hpp"

 class DLL_EXPORT QFontDialogWrap : public Napi::ObjectWrap<QFontDialogWrap> {
-  QDIALOG_WRAPPED_METHODS_DECLARATION_NO_ACCEPT_OR_DONE
+  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QFontDialog> instance;
+  QPointer<NFontDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QFontDialogWrap(const Napi::CallbackInfo& info);
  ~QFontDialogWrap();
-  QFontDialog* getInternalInstance();
+  NFontDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value selectedFont(const Napi::CallbackInfo& info);
  Napi::Value setOption(const Napi::CallbackInfo& info);
  Napi::Value testOption(const Napi::CallbackInfo& info);
-  Napi::Value accept(const Napi::CallbackInfo& info);
-  Napi::Value done(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QFrame/qframe_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QFrame/qframe_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QFrameWrap : public Napi::ObjectWrap<QFrameWrap> {
  QFRAME_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QFrame> instance;
+  QPointer<NFrame> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QFrameWrap(const Napi::CallbackInfo& info);
  ~QFrameWrap();
-  QFrame* getInternalInstance();
+  NFrame* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QGraphicsBlurEffect/qgraphicsblureffect_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QGraphicsBlurEffect/qgraphicsblureffect_wrap.h
@ -5,7 +5,6 @@
 #include <QPointer>

 #include "Extras/Export/export.h"
-#include "Extras/Utils/nutils.h"
 #include "QtWidgets/QGraphicsEffect/qgraphicseffect_macro.h"
 #include "ngraphicsblureffect.hpp"

@ -13,13 +12,13 @@ class DLL_EXPORT QGraphicsBlurEffectWrap
    : public Napi::ObjectWrap<QGraphicsBlurEffectWrap> {
  QGRAPHICSEFFECT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QGraphicsBlurEffect> instance;
+  QPointer<NGraphicsBlurEffect> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QGraphicsBlurEffectWrap(const Napi::CallbackInfo& info);
  ~QGraphicsBlurEffectWrap();
-  QGraphicsBlurEffect* getInternalInstance();
+  NGraphicsBlurEffect* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QGraphicsDropShadowEffect/qgraphicsdropshadoweffect_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QGraphicsDropShadowEffect/qgraphicsdropshadoweffect_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QGraphicsDropShadowEffectWrap
    : public Napi::ObjectWrap<QGraphicsDropShadowEffectWrap> {
  QGRAPHICSEFFECT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QGraphicsDropShadowEffect> instance;
+  QPointer<NGraphicsDropShadowEffect> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QGraphicsDropShadowEffectWrap(const Napi::CallbackInfo& info);
  ~QGraphicsDropShadowEffectWrap();
-  QGraphicsDropShadowEffect* getInternalInstance();
+  NGraphicsDropShadowEffect* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QGridLayoutWrap : public Napi::ObjectWrap<QGridLayoutWrap> {
  QLAYOUT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QGridLayout> instance;
+  QPointer<NGridLayout> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QGridLayoutWrap(const Napi::CallbackInfo& info);
  ~QGridLayoutWrap();
-  QGridLayout* getInternalInstance();
+  NGridLayout* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QGroupBoxWrap : public Napi::ObjectWrap<QGroupBoxWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QGroupBox> instance;
+  QPointer<NGroupBox> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QGroupBoxWrap(const Napi::CallbackInfo& info);
  ~QGroupBoxWrap();
-  QGroupBox* getInternalInstance();
+  NGroupBox* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QHeaderView/nheaderview.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QHeaderView/nheaderview.hpp
@ -21,7 +21,4 @@ class DLL_EXPORT NHeaderView : public QHeaderView, public NodeWidget {
  void _protected_scrollTo(const QModelIndex &index, ScrollHint hint) {
    scrollTo(index, hint);
  }
-  QRect _protected_visualRect(const QModelIndex &index) const {
-    return visualRect(index);
-  }
 };
--- a/src/cpp/include/nodegui/QtWidgets/QHeaderView/qheaderview_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QHeaderView/qheaderview_wrap.h
@ -43,24 +43,9 @@ class DLL_EXPORT QHeaderViewWrap : public Napi::ObjectWrap<QHeaderViewWrap> {
    return env.Null();
  }

-  Napi::Value visualRect(const Napi::CallbackInfo& info) {
-    Napi::Env env = info.Env();
-
-    NHeaderView* wrapper = dynamic_cast<NHeaderView*>(this->instance.data());
-    if (wrapper) {
-      QModelIndexWrap* indexWrap =
-          Napi::ObjectWrap<QModelIndexWrap>::Unwrap(info[0].As<Napi::Object>());
-      QModelIndex* index = indexWrap->getInternalInstance();
-      QRect ret = wrapper->_protected_visualRect(*index);
-      auto instance = QRectWrap::constructor.New(
-          {Napi::External<QRect>::New(env, new QRect(ret))});
-      return instance;
-    }
-    return env.Null();
-  }
-
 private:
  QPointer<QHeaderView> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
--- a/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QInputDialogWrap : public Napi::ObjectWrap<QInputDialogWrap> {
  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QInputDialog> instance;
+  QPointer<NInputDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QInputDialogWrap(const Napi::CallbackInfo& info);
  ~QInputDialogWrap();
-  QInputDialog* getInternalInstance();
+  NInputDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // members
--- a/src/cpp/include/nodegui/QtWidgets/QLCDNumber/qlcdnumber_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QLCDNumber/qlcdnumber_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QLCDNumberWrap : public Napi::ObjectWrap<QLCDNumberWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QLCDNumber> instance;
+  QPointer<NLCDNumber> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QLCDNumberWrap(const Napi::CallbackInfo& info);
  ~QLCDNumberWrap();
-  QLCDNumber* getInternalInstance();
+  NLCDNumber* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h
@ -12,20 +12,19 @@
 class DLL_EXPORT QLabelWrap : public Napi::ObjectWrap<QLabelWrap> {
  QFRAME_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QLabel> instance;
+  QPointer<NLabel> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QLabelWrap(const Napi::CallbackInfo& info);
  ~QLabelWrap();
-  QLabel* getInternalInstance();
+  NLabel* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value setSelection(const Napi::CallbackInfo& info);
  Napi::Value selectionStart(const Napi::CallbackInfo& info);
  Napi::Value setBuddy(const Napi::CallbackInfo& info);
-  Napi::Value buddy(const Napi::CallbackInfo& info);
  Napi::Value clear(const Napi::CallbackInfo& info);
  Napi::Value setMovie(const Napi::CallbackInfo& info);
  Napi::Value setNumDouble(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h
@ -13,13 +13,13 @@
 class DLL_EXPORT QLayoutWrap : public Napi::ObjectWrap<QLayoutWrap> {
  QLAYOUT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QLayout> instance;
+  QPointer<NLayout> instance;

 public:
-  static void init(Napi::Env env, Napi::Object exports);
+  static void init(Napi::Env env);
  QLayoutWrap(const Napi::CallbackInfo& info);
  ~QLayoutWrap();
-  QLayout* getInternalInstance();
+  NLayout* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h
@ -11,37 +11,20 @@
 class DLL_EXPORT QLineEditWrap : public Napi::ObjectWrap<QLineEditWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QLineEdit> instance;
+  QPointer<NLineEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QLineEditWrap(const Napi::CallbackInfo& info);
  ~QLineEditWrap();
-  QLineEdit* getInternalInstance();
+  NLineEdit* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
-  Napi::Value backspace(const Napi::CallbackInfo& info);
-  Napi::Value cursorBackward(const Napi::CallbackInfo& info);
-  Napi::Value cursorForward(const Napi::CallbackInfo& info);
-  Napi::Value cursorPositionAt(const Napi::CallbackInfo& info);
-  Napi::Value cursorWordBackward(const Napi::CallbackInfo& info);
-  Napi::Value cursorWordForward(const Napi::CallbackInfo& info);
-  Napi::Value del(const Napi::CallbackInfo& info);
-  Napi::Value deselect(const Napi::CallbackInfo& info);
-  Napi::Value end(const Napi::CallbackInfo& info);
-  Napi::Value home(const Napi::CallbackInfo& info);
-  Napi::Value insert(const Napi::CallbackInfo& info);
-  Napi::Value selectionEnd(const Napi::CallbackInfo& info);
-  Napi::Value selectionLength(const Napi::CallbackInfo& info);
-  Napi::Value selectionStart(const Napi::CallbackInfo& info);
-  Napi::Value setSelection(const Napi::CallbackInfo& info);
-  Napi::Value setTextMargins(const Napi::CallbackInfo& info);
+  Napi::Value setText(const Napi::CallbackInfo& info);
+  Napi::Value text(const Napi::CallbackInfo& info);
+  Napi::Value setPlaceholderText(const Napi::CallbackInfo& info);
+  Napi::Value setReadOnly(const Napi::CallbackInfo& info);
  Napi::Value clear(const Napi::CallbackInfo& info);
-  Napi::Value copy(const Napi::CallbackInfo& info);
-  Napi::Value cut(const Napi::CallbackInfo& info);
-  Napi::Value paste(const Napi::CallbackInfo& info);
-  Napi::Value redo(const Napi::CallbackInfo& info);
-  Napi::Value selectAll(const Napi::CallbackInfo& info);
-  Napi::Value undo(const Napi::CallbackInfo& info);
+  Napi::Value setEchoMode(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QListView/qlistview_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QListView/qlistview_wrap.h
@ -11,13 +11,14 @@
 class DLL_EXPORT QListViewWrap : public Napi::ObjectWrap<QListViewWrap> {
  QLISTVIEW_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QListView> instance;
+  QPointer<NListView> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QListViewWrap(const Napi::CallbackInfo& info);
  ~QListViewWrap();
-  QListView* getInternalInstance();
+  NListView* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QListWidgetWrap : public Napi::ObjectWrap<QListWidgetWrap> {
  QLISTVIEW_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QListWidget> instance;
+  QPointer<NListWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QListWidgetWrap(const Napi::CallbackInfo& info);
  ~QListWidgetWrap();
-  QListWidget* getInternalInstance();
+  NListWidget* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h
@ -12,17 +12,16 @@ class DLL_EXPORT QMainWindowWrap : public Napi::ObjectWrap<QMainWindowWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION

 private:
-  QPointer<QMainWindow> instance;
+  QPointer<NMainWindow> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QMainWindowWrap(const Napi::CallbackInfo& info);
  ~QMainWindowWrap();
-  QMainWindow* getInternalInstance();
+  NMainWindow* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
-  Napi::Value centralWidget(const Napi::CallbackInfo& info);
  Napi::Value setCentralWidget(const Napi::CallbackInfo& info);
  Napi::Value takeCentralWidget(const Napi::CallbackInfo& info);
  Napi::Value setMenuBar(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp
@ -17,8 +17,10 @@ class DLL_EXPORT NMenu : public QMenu, public NodeWidget {
    QObject::connect(this, &QMenu::triggered, [=](QAction* action) {
      Napi::Env env = this->emitOnNode.Env();
      Napi::HandleScope scope(env);
-      auto instance = WrapperCache::instance.getWrapper(env, action);
-      this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
+      auto actionInstance = QActionWrap::constructor.New(
+          {Napi::External<QAction>::New(env, action)});
+      this->emitOnNode.Call(
+          {Napi::String::New(env, "triggered"), actionInstance});
    });
  }
 };
--- a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h
@ -10,13 +10,13 @@
 class DLL_EXPORT QMenuWrap : public Napi::ObjectWrap<QMenuWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QMenu> instance;
+  QPointer<NMenu> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QMenuWrap(const Napi::CallbackInfo& info);
  ~QMenuWrap();
-  QMenu* getInternalInstance();
+  NMenu* getInternalInstance();
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value clear(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h
@ -10,13 +10,13 @@
 class DLL_EXPORT QMenuBarWrap : public Napi::ObjectWrap<QMenuBarWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QMenuBar> instance;
+  QPointer<NMenuBar> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QMenuBarWrap(const Napi::CallbackInfo& info);
  ~QMenuBarWrap();
-  QMenuBar* getInternalInstance();
+  NMenuBar* getInternalInstance();
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value addMenu(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h
@ -11,18 +11,20 @@
 class DLL_EXPORT QMessageBoxWrap : public Napi::ObjectWrap<QMessageBoxWrap> {
  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QMessageBox> instance;
+  QPointer<NMessageBox> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QMessageBoxWrap(const Napi::CallbackInfo& info);
  ~QMessageBoxWrap();
-  QMessageBox* getInternalInstance();
+  NMessageBox* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value setDefaultButton(const Napi::CallbackInfo& info);
  Napi::Value addButton(const Napi::CallbackInfo& info);
+  Napi::Value accept(const Napi::CallbackInfo& info);
+  Napi::Value done(const Napi::CallbackInfo& info);
 };
 namespace StaticQMessageBoxWrapMethods {
 DLL_EXPORT Napi::Value about(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h
@ -20,52 +20,38 @@ class DLL_EXPORT QPainterWrap : public Napi::ObjectWrap<QPainterWrap> {
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
+  Napi::Value drawArc(const Napi::CallbackInfo& info);
+  Napi::Value drawText(const Napi::CallbackInfo& info);
+  Napi::Value drawImage(const Napi::CallbackInfo& info);
+  Napi::Value drawPath(const Napi::CallbackInfo& info);
+  Napi::Value strokePath(const Napi::CallbackInfo& info);
  Napi::Value begin(const Napi::CallbackInfo& info);
  Napi::Value beginNativePainting(const Napi::CallbackInfo& info);
-  Napi::Value boundingRect(const Napi::CallbackInfo& info);
-  Napi::Value boundingRectF(const Napi::CallbackInfo& info);
-  Napi::Value compositionMode(const Napi::CallbackInfo& info);
-  Napi::Value drawArc(const Napi::CallbackInfo& info);
-  Napi::Value drawArcF(const Napi::CallbackInfo& info);
-  Napi::Value drawChord(const Napi::CallbackInfo& info);
-  Napi::Value drawChordF(const Napi::CallbackInfo& info);
-  Napi::Value drawConvexPolygon(const Napi::CallbackInfo& info);
-  Napi::Value drawConvexPolygonF(const Napi::CallbackInfo& info);
-  Napi::Value drawEllipse(const Napi::CallbackInfo& info);
-  Napi::Value drawEllipseF(const Napi::CallbackInfo& info);
-  Napi::Value drawImage(const Napi::CallbackInfo& info);
-  Napi::Value drawImageF(const Napi::CallbackInfo& info);
-  Napi::Value drawLine(const Napi::CallbackInfo& info);
-  Napi::Value drawLineF(const Napi::CallbackInfo& info);
-  Napi::Value drawPath(const Napi::CallbackInfo& info);
-  Napi::Value drawPie(const Napi::CallbackInfo& info);
-  Napi::Value drawPieF(const Napi::CallbackInfo& info);
-  Napi::Value drawPoint(const Napi::CallbackInfo& info);
-  Napi::Value drawPointF(const Napi::CallbackInfo& info);
-  Napi::Value drawRect(const Napi::CallbackInfo& info);
-  Napi::Value drawRectF(const Napi::CallbackInfo& info);
-  Napi::Value drawText(const Napi::CallbackInfo& info);
-  Napi::Value drawTextF(const Napi::CallbackInfo& info);
  Napi::Value end(const Napi::CallbackInfo& info);
  Napi::Value endNativePainting(const Napi::CallbackInfo& info);
-  Napi::Value eraseRect(const Napi::CallbackInfo& info);
-  Napi::Value eraseRectF(const Napi::CallbackInfo& info);
-  Napi::Value fillRect(const Napi::CallbackInfo& info);
-  Napi::Value fillRectF(const Napi::CallbackInfo& info);
-  Napi::Value opacity(const Napi::CallbackInfo& info);
-  Napi::Value restore(const Napi::CallbackInfo& info);
  Napi::Value rotate(const Napi::CallbackInfo& info);
-  Napi::Value save(const Napi::CallbackInfo& info);
-  Napi::Value scale(const Napi::CallbackInfo& info);
-  Napi::Value setBrush(const Napi::CallbackInfo& info);
-  Napi::Value setBrushOrigin(const Napi::CallbackInfo& info);
-  Napi::Value setBrushOriginF(const Napi::CallbackInfo& info);
-  Napi::Value setCompositionMode(const Napi::CallbackInfo& info);
  Napi::Value setFont(const Napi::CallbackInfo& info);
-  Napi::Value setOpacity(const Napi::CallbackInfo& info);
  Napi::Value setPen(const Napi::CallbackInfo& info);
  Napi::Value setRenderHint(const Napi::CallbackInfo& info);
  Napi::Value setTransform(const Napi::CallbackInfo& info);
-  Napi::Value strokePath(const Napi::CallbackInfo& info);
+  Napi::Value setBrush(const Napi::CallbackInfo& info);
+  Napi::Value drawLine(const Napi::CallbackInfo& info);
+  Napi::Value drawEllipse(const Napi::CallbackInfo& info);
+  Napi::Value drawPie(const Napi::CallbackInfo& info);
+  Napi::Value scale(const Napi::CallbackInfo& info);
  Napi::Value translate(const Napi::CallbackInfo& info);
+  Napi::Value drawConvexPolygon(const Napi::CallbackInfo& info);
+  Napi::Value save(const Napi::CallbackInfo& info);
+  Napi::Value restore(const Napi::CallbackInfo& info);
+  Napi::Value fillRect(const Napi::CallbackInfo& info);
+  Napi::Value compositionMode(const Napi::CallbackInfo& info);
+  Napi::Value setCompositionMode(const Napi::CallbackInfo& info);
+  Napi::Value opacity(const Napi::CallbackInfo& info);
+  Napi::Value setOpacity(const Napi::CallbackInfo& info);
+  Napi::Value drawPoint(const Napi::CallbackInfo& info);
+  Napi::Value drawRect(const Napi::CallbackInfo& info);
+  Napi::Value eraseRect(const Napi::CallbackInfo& info);
+  Napi::Value boundingRect(const Napi::CallbackInfo& info);
+  Napi::Value drawChord(const Napi::CallbackInfo& info);
+  Napi::Value setBrushOrigin(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h
@ -13,13 +13,13 @@ class DLL_EXPORT QPlainTextEditWrap
    : public Napi::ObjectWrap<QPlainTextEditWrap> {
  QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QPlainTextEdit> instance;
+  QPointer<NPlainTextEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QPlainTextEditWrap(const Napi::CallbackInfo &info);
  ~QPlainTextEditWrap();
-  QPlainTextEdit *getInternalInstance();
+  NPlainTextEdit *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QProgressBarWrap : public Napi::ObjectWrap<QProgressBarWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QProgressBar> instance;
+  QPointer<NProgressBar> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QProgressBarWrap(const Napi::CallbackInfo& info);
  ~QProgressBarWrap();
-  QProgressBar* getInternalInstance();
+  NProgressBar* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QProgressDialog/qprogressdialog_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QProgressDialog/qprogressdialog_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QProgressDialogWrap
    : public Napi::ObjectWrap<QProgressDialogWrap> {
  QDIALOG_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QProgressDialog> instance;
+  QPointer<NProgressDialog> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QProgressDialogWrap(const Napi::CallbackInfo& info);
  ~QProgressDialogWrap();
-  QProgressDialog* getInternalInstance();
+  NProgressDialog* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h
@ -12,17 +12,17 @@
 class DLL_EXPORT QPushButtonWrap : public Napi::ObjectWrap<QPushButtonWrap> {
  QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QPushButton> instance;
+  QPointer<NPushButton> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QPushButtonWrap(const Napi::CallbackInfo& info);
  ~QPushButtonWrap();
-  QPushButton* getInternalInstance();
+  NPushButton* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value setMenu(const Napi::CallbackInfo& info);
-  Napi::Value menu(const Napi::CallbackInfo& info);
  Napi::Value showMenu(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h
@ -13,13 +13,14 @@ class DLL_EXPORT QRadioButtonWrap : public Napi::ObjectWrap<QRadioButtonWrap> {
  QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION

 private:
-  QPointer<QRadioButton> instance;
+  QPointer<NRadioButton> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QRadioButtonWrap(const Napi::CallbackInfo& info);
  ~QRadioButtonWrap();
-  QRadioButton* getInternalInstance();
+  NRadioButton* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h
@ -11,20 +11,20 @@
 class DLL_EXPORT QScrollAreaWrap : public Napi::ObjectWrap<QScrollAreaWrap> {
  QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QScrollArea> instance;
+  QPointer<NScrollArea> instance;
+  YGNodeRef scrollNode;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QScrollAreaWrap(const Napi::CallbackInfo& info);
  ~QScrollAreaWrap();
-  QScrollArea* getInternalInstance();
+  NScrollArea* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value ensureVisible(const Napi::CallbackInfo& info);
  Napi::Value ensureWidgetVisible(const Napi::CallbackInfo& info);
  Napi::Value setWidget(const Napi::CallbackInfo& info);
-  Napi::Value widget(const Napi::CallbackInfo& info);
  Napi::Value takeWidget(const Napi::CallbackInfo& info);
  Napi::Value setViewportMargins(const Napi::CallbackInfo& info);
  Napi::Value viewportMargins(const Napi::CallbackInfo& info);
--- a/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QScrollBarWrap : public Napi::ObjectWrap<QScrollBarWrap> {
  QABSTRACTSLIDER_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QScrollBar> instance;
+  QPointer<NScrollBar> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QScrollBarWrap(const Napi::CallbackInfo& info);
  ~QScrollBarWrap();
-  QScrollBar* getInternalInstance();
+  NScrollBar* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QShortcutWrap : public Napi::ObjectWrap<QShortcutWrap> {
  QOBJECT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QShortcut> instance;
+  QPointer<NShortcut> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QShortcutWrap(const Napi::CallbackInfo& info);
  ~QShortcutWrap();
-  QShortcut* getInternalInstance();
+  NShortcut* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QSliderWrap : public Napi::ObjectWrap<QSliderWrap> {
  QABSTRACTSLIDER_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QSlider> instance;
+  QPointer<NSlider> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QSliderWrap(const Napi::CallbackInfo& info);
  ~QSliderWrap();
-  QSlider* getInternalInstance();
+  NSlider* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QSpinBoxWrap : public Napi::ObjectWrap<QSpinBoxWrap> {
  QABSTRACTSPINBOX_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QSpinBox> instance;
+  QPointer<NSpinBox> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QSpinBoxWrap(const Napi::CallbackInfo &info);
  ~QSpinBoxWrap();
-  QSpinBox *getInternalInstance();
+  NSpinBox *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QSplitter/qsplitter_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSplitter/qsplitter_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QSplitterWrap : public Napi::ObjectWrap<QSplitterWrap> {
  QFRAME_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QSplitter> instance;
+  QPointer<NSplitter> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QSplitterWrap(const Napi::CallbackInfo& info);
  ~QSplitterWrap();
-  QSplitter* getInternalInstance();
+  NSplitter* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QStackedWidgetWrap
    : public Napi::ObjectWrap<QStackedWidgetWrap> {
  QFRAME_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QStackedWidget> instance;
+  QPointer<NStackedWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QStackedWidgetWrap(const Napi::CallbackInfo &info);
  ~QStackedWidgetWrap();
-  QStackedWidget *getInternalInstance();
+  NStackedWidget *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QStandardItemModel/qstandarditemmodel_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QStandardItemModel/qstandarditemmodel_wrap.h
@ -10,13 +10,13 @@
 class DLL_EXPORT QStandardItemModelWrap
    : public Napi::ObjectWrap<QStandardItemModelWrap> {
 private:
-  QPointer<QStandardItemModel> instance;
+  QPointer<NStandardItemModel> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QStandardItemModelWrap(const Napi::CallbackInfo& info);
  ~QStandardItemModelWrap();
-  QStandardItemModel* getInternalInstance();
+  NStandardItemModel* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h
@ -12,7 +12,7 @@ class DLL_EXPORT QStatusBarWrap : public Napi::ObjectWrap<QStatusBarWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION

 private:
-  QPointer<QStatusBar> instance;
+  QPointer<NStatusBar> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
@ -22,7 +22,7 @@ class DLL_EXPORT QStatusBarWrap : public Napi::ObjectWrap<QStatusBarWrap> {
  QStatusBarWrap(const Napi::CallbackInfo &info);
  ~QStatusBarWrap();

-  QStatusBar *getInternalInstance();
+  NStatusBar *getInternalInstance();

  // Wrapped methods
  Napi::Value addPermanentWidget(const Napi::CallbackInfo &info);
--- a/src/cpp/include/nodegui/QtWidgets/QSvgWidget/qsvgwidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSvgWidget/qsvgwidget_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QSvgWidgetWrap : public Napi::ObjectWrap<QSvgWidgetWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QSvgWidget> instance;
+  QPointer<NSvgWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QSvgWidgetWrap(const Napi::CallbackInfo& info);
  ~QSvgWidgetWrap();
-  QSvgWidget* getInternalInstance();
+  NSvgWidget* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h
@ -12,13 +12,13 @@ class DLL_EXPORT QSystemTrayIconWrap
    : public Napi::ObjectWrap<QSystemTrayIconWrap> {
  QOBJECT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QSystemTrayIcon> instance;
+  QPointer<NSystemTrayIcon> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QSystemTrayIconWrap(const Napi::CallbackInfo& info);
  ~QSystemTrayIconWrap();
-  QSystemTrayIcon* getInternalInstance();
+  NSystemTrayIcon* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QTabBar/qtabbar_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTabBar/qtabbar_wrap.h
@ -11,13 +11,14 @@
 class DLL_EXPORT QTabBarWrap : public Napi::ObjectWrap<QTabBarWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTabBar> instance;
+  QPointer<NTabBar> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTabBarWrap(const Napi::CallbackInfo& info);
  ~QTabBarWrap();
-  QTabBar* getInternalInstance();
+  NTabBar* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QTabWidgetWrap : public Napi::ObjectWrap<QTabWidgetWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTabWidget> instance;
+  QPointer<NTabWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTabWidgetWrap(const Napi::CallbackInfo &info);
  ~QTabWidgetWrap();
-  QTabWidget *getInternalInstance();
+  NTabWidget *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
@ -31,5 +31,4 @@ class DLL_EXPORT QTabWidgetWrap : public Napi::ObjectWrap<QTabWidgetWrap> {
  Napi::Value setTabsClosable(const Napi::CallbackInfo &info);
  Napi::Value setTabText(const Napi::CallbackInfo &info);
  Napi::Value setTabIcon(const Napi::CallbackInfo &info);
-  Napi::Value widget(const Napi::CallbackInfo &info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QTableView/qtableview_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTableView/qtableview_macro.h
@ -181,13 +181,15 @@
  Napi::Value horizontalHeader(const Napi::CallbackInfo& info) {              \
    Napi::Env env = info.Env();                                               \
    auto header = this->instance->horizontalHeader();                         \
-    auto instance = WrapperCache::instance.getWrapper(env, header);           \
+    auto instance = QHeaderViewWrap::constructor.New(                         \
+        {Napi::External<QHeaderView>::New(env, header)});                     \
    return instance;                                                          \
  }                                                                           \
  Napi::Value verticalHeader(const Napi::CallbackInfo& info) {                \
    Napi::Env env = info.Env();                                               \
    auto header = this->instance->verticalHeader();                           \
-    auto instance = WrapperCache::instance.getWrapper(env, header);           \
+    auto instance = QHeaderViewWrap::constructor.New(                         \
+        {Napi::External<QHeaderView>::New(env, header)});                     \
    return instance;                                                          \
  }

--- a/src/cpp/include/nodegui/QtWidgets/QTableView/qtableview_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTableView/qtableview_wrap.h
@ -11,13 +11,14 @@
 class DLL_EXPORT QTableViewWrap : public Napi::ObjectWrap<QTableViewWrap> {
  QTABLEVIEW_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTableView> instance;
+  QPointer<NTableView> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTableViewWrap(const Napi::CallbackInfo& info);
  ~QTableViewWrap();
-  QTableView* getInternalInstance();
+  NTableView* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QTableWidgetWrap : public Napi::ObjectWrap<QTableWidgetWrap> {
  QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTableWidget> instance;
+  QPointer<NTableWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTableWidgetWrap(const Napi::CallbackInfo& info);
  ~QTableWidgetWrap();
-  QTableWidget* getInternalInstance();
+  NTableWidget* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
@ -80,8 +80,4 @@ class DLL_EXPORT QTableWidgetWrap : public Napi::ObjectWrap<QTableWidgetWrap> {
  Napi::Value setRowCount(const Napi::CallbackInfo& info);
  Napi::Value setSortingEnabled(const Napi::CallbackInfo& info);
  Napi::Value isSortingEnabled(const Napi::CallbackInfo& info);
-  Napi::Value clearSelection(const Napi::CallbackInfo& info);
-  Napi::Value selectAll(const Napi::CallbackInfo& info);
-  Napi::Value scrollToBottom(const Napi::CallbackInfo& info);
-  Napi::Value scrollToTop(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QTextBrowser/ntextbrowser.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QTextBrowser/ntextbrowser.hpp
@ -38,13 +38,14 @@ class DLL_EXPORT NTextBrowser : public QTextBrowser, public NodeWidget {
          this->emitOnNode.Call({Napi::String::New(env, "forwardAvailable"),
                                 Napi::Boolean::New(env, available)});
        });
-    QObject::connect(this, &QTextBrowser::highlighted, [=](const QUrl& link) {
-      Napi::Env env = this->emitOnNode.Env();
-      Napi::HandleScope scope(env);
-      this->emitOnNode.Call(
-          {Napi::String::New(env, "highlighted"),
-           Napi::String::New(env, link.toString().toStdString())});
-    });
+    QObject::connect(
+        this, QOverload<const QString&>::of(&QTextBrowser::highlighted),
+        [=](const QString& link) {
+          Napi::Env env = this->emitOnNode.Env();
+          Napi::HandleScope scope(env);
+          this->emitOnNode.Call({Napi::String::New(env, "highlighted"),
+                                 Napi::String::New(env, link.toStdString())});
+        });
    QObject::connect(this, &QTextBrowser::historyChanged, [=]() {
      Napi::Env env = this->emitOnNode.Env();
      Napi::HandleScope scope(env);
--- a/src/cpp/include/nodegui/QtWidgets/QTextBrowser/qtextbrowser_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTextBrowser/qtextbrowser_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QTextBrowserWrap : public Napi::ObjectWrap<QTextBrowserWrap> {
  QTEXTEDIT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTextBrowser> instance;
+  QPointer<NTextBrowser> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTextBrowserWrap(const Napi::CallbackInfo& info);
  ~QTextBrowserWrap();
-  QTextBrowser* getInternalInstance();
+  NTextBrowser* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QTextEdit/qtextedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTextEdit/qtextedit_wrap.h
@ -11,13 +11,13 @@
 class DLL_EXPORT QTextEditWrap : public Napi::ObjectWrap<QTextEditWrap> {
  QTEXTEDIT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTextEdit> instance;
+  QPointer<NTextEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTextEditWrap(const Napi::CallbackInfo& info);
  ~QTextEditWrap();
-  QTextEdit* getInternalInstance();
+  NTextEdit* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h
@ -12,13 +12,13 @@
 class DLL_EXPORT QTimeEditWrap : public Napi::ObjectWrap<QTimeEditWrap> {
  QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTimeEdit> instance;
+  QPointer<NTimeEdit> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QTimeEditWrap(const Napi::CallbackInfo &info);
  ~QTimeEditWrap();
-  QTimeEdit *getInternalInstance();
+  NTimeEdit *getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
--- a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp
@ -21,7 +21,11 @@ class DLL_EXPORT NToolButton : public QToolButton, public NodeWidget {
    QObject::connect(this, &QToolButton::triggered, [=](QAction* action) {
      Napi::Env env = this->emitOnNode.Env();
      Napi::HandleScope scope(env);
-      auto instance = WrapperCache::instance.getWrapper(env, action);
+
+      // disable deletion of the native instance for these by passing true
+      auto instance = QActionWrap::constructor.New(
+          {Napi::External<QAction>::New(env, action),
+           Napi::Boolean::New(env, true)});
      this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
    });
  }
--- a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h
@ -12,18 +12,18 @@
 class DLL_EXPORT QToolButtonWrap : public Napi::ObjectWrap<QToolButtonWrap> {
  QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QToolButton> instance;
+  QPointer<NToolButton> instance;
+  bool disableDeletion;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
  QToolButtonWrap(const Napi::CallbackInfo& info);
  ~QToolButtonWrap();
-  QToolButton* getInternalInstance();
+  NToolButton* getInternalInstance();
  // class constructor
  static Napi::FunctionReference constructor;
  // wrapped methods
  Napi::Value setMenu(const Napi::CallbackInfo& info);
  Napi::Value setDefaultAction(const Napi::CallbackInfo& info);
  Napi::Value showMenu(const Napi::CallbackInfo& info);
-  Napi::Value defaultAction(const Napi::CallbackInfo& info);
 };
--- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h
@ -11,7 +11,7 @@
 class DLL_EXPORT QTreeWidgetWrap : public Napi::ObjectWrap<QTreeWidgetWrap> {
  QWIDGET_WRAPPED_METHODS_DECLARATION
 private:
-  QPointer<QTreeWidget> instance;
+  QPointer<NTreeWidget> instance;

 public:
  static Napi::Object init(Napi::Env env, Napi::Object exports);
@ -20,7 +20,7 @@ class DLL_EXPORT QTreeWidgetWrap : public Napi::ObjectWrap<QTreeWidgetWrap> {

  ~QTreeWidgetWrap();

-  QTreeWidget *getInternalInstance();
+  NTreeWidget *getInternalInstance();

  // class constructor
  static Napi::FunctionReference constructor;
--- a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp
+++ b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp
@ -16,15 +16,11 @@ class DLL_EXPORT NWidget : public QWidget, public NodeWidget {
  // https://doc.qt.io/qt-5/stylesheet-reference.html
  void paintEvent(QPaintEvent* e) override {
    QStyleOption opt;
-    opt.initFrom(this);
+    opt.init(this);
    QPainter p(this);
    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
    QWidget::paintEvent(e);
  }

  virtual void connectSignalsToEventEmitter() { QWIDGET_SIGNALS }
-
-  void _protected_updateMicroFocus(Qt::InputMethodQuery query) {
-    updateMicroFocus(query);
-  }
 };
--- a/Show More
+++ b/Show More