diff --git a/package.json b/package.json
index 5a1ef61..3dd838b 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
     "@angular/platform-browser-dynamic": "~10.2.5",
     "@angular/router": "~10.2.5",
     "@ng-select/ng-select": "^5",
+    "@openharbor/ngx-data": "^18.0.0-alpha.3",
     "@poweredsoft/data": "0.0.36",
-    "@poweredsoft/ngx-data": "0.0.22",
     "@poweredsoft/ngx-data-apollo": "0.0.10",
     "apollo-angular": "^1.8.0",
     "apollo-angular-link-http": "^1.9.0",
diff --git a/yarn.lock b/yarn.lock
index d192d22..9d628e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1217,6 +1217,13 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@openharbor/ngx-data@^18.0.0-alpha.3":
+  version "18.0.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/@openharbor/ngx-data/-/ngx-data-18.0.0-alpha.3.tgz#474b59a8622cc2f834f738428d28e270505da46c"
+  integrity sha512-PODSblrlQtnOeWhDe935/2Fierf1GRL7PeNPQ6Vx8MNmmq0Pj5X/8BiOq0yno0V/YjZNwqBabQscebXGhMIZBg==
+  dependencies:
+    tslib "^2.7.0"
+
 "@poweredsoft/data@0.0.36":
   version "0.0.36"
   resolved "https://registry.yarnpkg.com/@poweredsoft/data/-/data-0.0.36.tgz#efdf7f78a16635ab42f91bf7fc59e0ada430b104"
@@ -1231,13 +1238,6 @@
   dependencies:
     tslib "^1.9.0"
 
-"@poweredsoft/ngx-data@0.0.22":
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/@poweredsoft/ngx-data/-/ngx-data-0.0.22.tgz#a99e465b325ce843b9b7fca3486ae59f51ecfb52"
-  integrity sha512-U4kMKlshTpu2/BpjQ/ULESFbaxJOYUjB6Qoax5rXY/vXErYBdVeQWhv/v4MxMLn8gPltjOzVKpEnQPVAlWZT5g==
-  dependencies:
-    tslib "^1.9.0"
-
 "@rollup/plugin-commonjs@^15.0.0":
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz#1e7d076c4f1b2abf7e65248570e555defc37c238"
@@ -9501,7 +9501,7 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.1.0:
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
   integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==