diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa8fe11..a21b1f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,6 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 set(NAPI_CPP_EXCEPTIONS "yes")
-set(CMAKE_CXX_FLAGS -fPIC)
 set(CMAKE_EXPORT_COMPILE_COMMANDS "yes")
 set(CMAKE_CXX_FLAGS "-fPIC")
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-rpath=/var/task/node_modules/norc-aws/lib")
@@ -24,17 +23,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 if (NOT PROJECT_DIR)
     message(WARNING "Project dir not explicity set using cmake source directory: ${CMAKE_SOURCE_DIR}")
     set(NAPI_MODULE "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api")
-    set(NAPI_SRC "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api/src")
 else()
     set(NAPI_MODULE "${PROJECT_DIR}/node_modules/node-addon-api")
-    set(NAPI_SRC  "${PROJECT_DIR}/node_modules/node-addon-api/src")
 endif()
-message(WARNING "Using napi: ${NAPI_MODULE}")
 target_include_directories(${PROJECT_NAME} PRIVATE
-        ${NAPI_MODULE}
-        ${NAPI_MODULE}/include
-        ${NAPI_SRC}
-        ${CMAKE_JS_INC} )
+        ${CMAKE_JS_INC}
+        ${NAPI_MODULE})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} stdc++fs)
 find_package(Threads REQUIRED)
 
diff --git a/package-lock.json b/package-lock.json
index be38471..9c30faa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -952,9 +952,9 @@
       "dev": true
     },
     "node-addon-api": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.5.0.tgz",
-      "integrity": "sha512-YsL/8dpBWxCFj3wAVAa/ceN4TlT8lACK8EgpuN0q/4ecflWHDuKpodb+tt7Rx22r/6FJ2f+IT25XSsXnZGwYgA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.0.tgz",
+      "integrity": "sha512-HEUPBHfdH4CLR1Qq4/Ek8GT/qFSvpApjJQmcYdLCL51ADU/Y11kMuFAdIevhNrPh3ylqVGA8k6vI/oi4YUAHbA==",
       "dev": true
     },
     "npmlog": {
diff --git a/package.json b/package.json
index 803f7e3..99c6ca6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npilots/norc",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Nodejs ORC file reader/writer",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,7 +30,7 @@
     "alsatian": "^2.3.0",
     "cmake-js": "^3.7.3",
     "fast-csv": "^2.4.1",
-    "node-addon-api": "1.5.0",
+    "node-addon-api": "1.6.0",
     "tap-bark": "^1.0.0"
   },
   "files": [