diff --git a/.nvmrc b/.nvmrc
index ba17e93..2dbbe00 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.8
\ No newline at end of file
+20.11.1
diff --git a/filter_ownership.aql b/filter_ownership.aql
index 300a062..7f2eca4 100644
--- a/filter_ownership.aql
+++ b/filter_ownership.aql
@@ -2,10 +2,11 @@ let meta = node.meta
 let owner = meta.owners
 let found = (
     for o in owner
-    filter o.id == "urn:restorecommerce:acs:names:ownerIndicatoryEntity" && o.value == @entity
-    let nestedAttributes = o.attributes
-    for ownerInst in nestedAttributes
-      filter ownerInst.id == "urn:restorecommerce:acs:names:ownerInstance" && ownerInst.value in @instance    
-    return true
+    for arg in @customArguments
+      filter o.id == "urn:restorecommerce:acs:names:ownerIndicatoryEntity" && o.value == arg.entity
+      let nestedAttributes = o.attributes
+      for ownerInst in nestedAttributes
+        filter ownerInst.id == "urn:restorecommerce:acs:names:ownerInstance" && ownerInst.value in arg.instance    
+      return true
 )
 filter true in found
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 29ab7d6..65133fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,13 +9,13 @@
       "version": "1.5.1",
       "license": "MIT",
       "dependencies": {
-        "@restorecommerce/acs-client": "^1.5.1",
-        "@restorecommerce/chassis-srv": "^1.5.0",
+        "@restorecommerce/acs-client": "^1.6.0",
+        "@restorecommerce/chassis-srv": "^1.6.0",
         "@restorecommerce/cluster-service": "^1.0.3",
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
         "@restorecommerce/rc-grpc-clients": "^5.1.23",
-        "@restorecommerce/resource-base-interface": "^1.5.0",
+        "@restorecommerce/resource-base-interface": "^1.6.0",
         "@restorecommerce/service-config": "^1.0.12",
         "lodash-es": "^4.17.21",
         "redis": "^4.6.13",
@@ -2389,9 +2389,9 @@
       }
     },
     "node_modules/@restorecommerce/acs-client": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/acs-client/-/acs-client-1.5.1.tgz",
-      "integrity": "sha512-qQcyHHr/uVPjWUDls02bTRgTekNgXqzHzApIC8SqdCVemFmQjnkUsCMiTe9Bz8x9s1t0nNdMouva2yVTBs3j1g==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/acs-client/-/acs-client-1.6.0.tgz",
+      "integrity": "sha512-Y7mr8E3+qij6YxP7Nkw6dndMlQtsY76GhTmi+nInVTEpP6o/VKwqCFe7fY8wbP3S+rmnzjmvZBvbnSWGPOvUyw==",
       "dependencies": {
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
@@ -2406,18 +2406,18 @@
       }
     },
     "node_modules/@restorecommerce/chassis-srv": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/chassis-srv/-/chassis-srv-1.5.0.tgz",
-      "integrity": "sha512-oODzFgwya6Fuwmbijojk6QO+3jUzRKHaMF6w1t3v8pyAbiUAEuBdWHcAjszIkG7YHi82LXcBYA2DSdPH2KFjvw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/chassis-srv/-/chassis-srv-1.6.0.tgz",
+      "integrity": "sha512-CMltw92n0H1XgD+lGkZ0hKDQOM8Png9IxyEB179rRrok2C4fkXK80420ect/X7EISVDUdWqThijzqRzuhMflgQ==",
       "dependencies": {
         "@grpc/grpc-js": "^1.10.6",
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
         "@restorecommerce/logger": "^1.2.10",
-        "@restorecommerce/protos": "^6.8.1",
+        "@restorecommerce/protos": "^6.8.2",
         "@restorecommerce/rc-grpc-clients": "^5.1.23",
         "@restorecommerce/service-config": "^1.0.12",
-        "arangojs": "^8.7.0",
+        "arangojs": "8.7.0",
         "async": "^3.2.5",
         "async-retry": "^1.3.3",
         "cache-manager": "4.1.0",
@@ -2740,9 +2740,9 @@
       }
     },
     "node_modules/@restorecommerce/protos": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/protos/-/protos-6.8.1.tgz",
-      "integrity": "sha512-xkyC2IicFVLOmZzKtrDsuVw9M1Qq/1MN5V0IoiTbTlW17jlr8GgY3wlslDhRNR4grp6RThOZLBMWg+SxKdGoBw=="
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/protos/-/protos-6.8.2.tgz",
+      "integrity": "sha512-id/ojKw2yRH++fmUabhpBc1jc/RUO2WIfMcvX88AX8u5GSzKElqjsXGKnl9GMs/duiBnATEYrWkeMztZk+5GmQ=="
     },
     "node_modules/@restorecommerce/rc-grpc-clients": {
       "version": "5.1.23",
@@ -2764,20 +2764,21 @@
       }
     },
     "node_modules/@restorecommerce/resource-base-interface": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/resource-base-interface/-/resource-base-interface-1.5.0.tgz",
-      "integrity": "sha512-MMpcRNhNKz6cYEp8x0jPv6dK2reOKQka2Um/2za/o6c4OIHuG/1OwVija2uCzuDYtJT7Xzfgb4CQyYT6BomTmw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/resource-base-interface/-/resource-base-interface-1.6.0.tgz",
+      "integrity": "sha512-4A/H2VAogyJiUCXfzENtbJs2qNc/nX/Tw9yj+BZ0yAFV961ZD5p/WXWyc7+h9sr86bU0PLfKc5wEBEy0fXVTxQ==",
       "dependencies": {
-        "@restorecommerce/chassis-srv": "^1.5.0",
+        "@restorecommerce/chassis-srv": "^1.6.0",
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
         "@restorecommerce/rc-grpc-clients": "^5.1.23",
         "@restorecommerce/service-config": "^1.0.12",
         "lodash": "^4.17.21",
+        "nice-grpc": "^2.1.8",
         "redis": "^4.6.13"
       },
       "engines": {
-        "node": ">= 18.8.0"
+        "node": ">= 20.0.0"
       }
     },
     "node_modules/@restorecommerce/service-config": {
@@ -23499,9 +23500,9 @@
       "requires": {}
     },
     "@restorecommerce/acs-client": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/acs-client/-/acs-client-1.5.1.tgz",
-      "integrity": "sha512-qQcyHHr/uVPjWUDls02bTRgTekNgXqzHzApIC8SqdCVemFmQjnkUsCMiTe9Bz8x9s1t0nNdMouva2yVTBs3j1g==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/acs-client/-/acs-client-1.6.0.tgz",
+      "integrity": "sha512-Y7mr8E3+qij6YxP7Nkw6dndMlQtsY76GhTmi+nInVTEpP6o/VKwqCFe7fY8wbP3S+rmnzjmvZBvbnSWGPOvUyw==",
       "requires": {
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
@@ -23516,18 +23517,18 @@
       }
     },
     "@restorecommerce/chassis-srv": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/chassis-srv/-/chassis-srv-1.5.0.tgz",
-      "integrity": "sha512-oODzFgwya6Fuwmbijojk6QO+3jUzRKHaMF6w1t3v8pyAbiUAEuBdWHcAjszIkG7YHi82LXcBYA2DSdPH2KFjvw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/chassis-srv/-/chassis-srv-1.6.0.tgz",
+      "integrity": "sha512-CMltw92n0H1XgD+lGkZ0hKDQOM8Png9IxyEB179rRrok2C4fkXK80420ect/X7EISVDUdWqThijzqRzuhMflgQ==",
       "requires": {
         "@grpc/grpc-js": "^1.10.6",
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
         "@restorecommerce/logger": "^1.2.10",
-        "@restorecommerce/protos": "^6.8.1",
+        "@restorecommerce/protos": "^6.8.2",
         "@restorecommerce/rc-grpc-clients": "^5.1.23",
         "@restorecommerce/service-config": "^1.0.12",
-        "arangojs": "^8.7.0",
+        "arangojs": "8.7.0",
         "async": "^3.2.5",
         "async-retry": "^1.3.3",
         "cache-manager": "4.1.0",
@@ -23734,9 +23735,9 @@
       }
     },
     "@restorecommerce/protos": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/protos/-/protos-6.8.1.tgz",
-      "integrity": "sha512-xkyC2IicFVLOmZzKtrDsuVw9M1Qq/1MN5V0IoiTbTlW17jlr8GgY3wlslDhRNR4grp6RThOZLBMWg+SxKdGoBw=="
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/protos/-/protos-6.8.2.tgz",
+      "integrity": "sha512-id/ojKw2yRH++fmUabhpBc1jc/RUO2WIfMcvX88AX8u5GSzKElqjsXGKnl9GMs/duiBnATEYrWkeMztZk+5GmQ=="
     },
     "@restorecommerce/rc-grpc-clients": {
       "version": "5.1.23",
@@ -23755,16 +23756,17 @@
       }
     },
     "@restorecommerce/resource-base-interface": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@restorecommerce/resource-base-interface/-/resource-base-interface-1.5.0.tgz",
-      "integrity": "sha512-MMpcRNhNKz6cYEp8x0jPv6dK2reOKQka2Um/2za/o6c4OIHuG/1OwVija2uCzuDYtJT7Xzfgb4CQyYT6BomTmw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@restorecommerce/resource-base-interface/-/resource-base-interface-1.6.0.tgz",
+      "integrity": "sha512-4A/H2VAogyJiUCXfzENtbJs2qNc/nX/Tw9yj+BZ0yAFV961ZD5p/WXWyc7+h9sr86bU0PLfKc5wEBEy0fXVTxQ==",
       "requires": {
-        "@restorecommerce/chassis-srv": "^1.5.0",
+        "@restorecommerce/chassis-srv": "^1.6.0",
         "@restorecommerce/grpc-client": "^2.2.1",
         "@restorecommerce/kafka-client": "^1.2.1",
         "@restorecommerce/rc-grpc-clients": "^5.1.23",
         "@restorecommerce/service-config": "^1.0.12",
         "lodash": "^4.17.21",
+        "nice-grpc": "^2.1.8",
         "redis": "^4.6.13"
       }
     },
diff --git a/package.json b/package.json
index 1d01908..b18c6f3 100644
--- a/package.json
+++ b/package.json
@@ -17,13 +17,13 @@
   ],
   "type": "module",
   "dependencies": {
-    "@restorecommerce/acs-client": "^1.5.1",
-    "@restorecommerce/chassis-srv": "^1.5.0",
+    "@restorecommerce/acs-client": "^1.6.0",
+    "@restorecommerce/chassis-srv": "^1.6.0",
     "@restorecommerce/cluster-service": "^1.0.3",
     "@restorecommerce/grpc-client": "^2.2.1",
     "@restorecommerce/kafka-client": "^1.2.1",
     "@restorecommerce/rc-grpc-clients": "^5.1.23",
-    "@restorecommerce/resource-base-interface": "^1.5.0",
+    "@restorecommerce/resource-base-interface": "^1.6.0",
     "@restorecommerce/service-config": "^1.0.12",
     "lodash-es": "^4.17.21",
     "redis": "^4.6.13",