diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index f8e0cee..46a3dc6 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -639,8 +639,7 @@
             metaItemTypeAnonymous = true; // doesn't matter
         }
 
-        Identifier ngNameId = dd.getNodegroupName();
-        String nodegroupName = ngNameId == null ? null : ngNameId.getValue();
+        String nodegroupName = dd.getNodegroupName();
         String compactionPolicy = dd.getCompactionPolicy();
         boolean defaultCompactionPolicy = compactionPolicy == null;
 
@@ -665,7 +664,7 @@
         MutableObject<ProgressState> progress = new MutableObject<>(ProgressState.NO_PROGRESS);
         SourceLocation sourceLoc = dd.getSourceLocation();
         DatasetType dsType = dd.getDatasetType();
-        Identifier ngNameId = dd.getNodegroupName();
+        String ngNameId = dd.getNodegroupName();
         String compactionPolicy = dd.getCompactionPolicy();
         Map<String, String> compactionPolicyProperties = dd.getCompactionPolicyProperties();
         String compressionScheme = metadataProvider.getCompressionManager()
@@ -714,7 +713,7 @@
                     throw new CompilationException(ErrorCode.COMPILATION_ILLEGAL_STATE, sourceLoc,
                             String.valueOf(itemTypeExpr.getTypeKind()));
             }
-            String ngName = ngNameId != null ? ngNameId.getValue()
+            String ngName = ngNameId != null ? ngNameId
                     : configureNodegroupForDataset(appCtx, dd.getHints(), dataverseName, datasetName, metadataProvider,
                             sourceLoc);
 
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
index d4cb04f..b34f5c6 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
@@ -112,8 +112,8 @@
         testExecutor.executeSqlppUpdateOrDdl("CREATE nodegroup " + nodeGroup + " on asterix_nc2;", format);
         // create original dataset
         testExecutor.executeSqlppUpdateOrDdl("CREATE TYPE KeyType AS { id: int };", format);
-        testExecutor.executeSqlppUpdateOrDdl(
-                "CREATE DATASET " + datasetName + "(KeyType) PRIMARY KEY id on " + nodeGroup + ";", format);
+        testExecutor.executeSqlppUpdateOrDdl("CREATE DATASET " + datasetName
+                + "(KeyType) PRIMARY KEY id WITH {\"node-group\":{\"name\":\"" + nodeGroup + "\"}};", format);
         // find source dataset
         Dataset sourceDataset;
         MetadataProvider metadataProvider = MetadataProvider.create(appCtx, null);
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql b/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql
index 053fc58..fad1243 100644
--- a/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql
+++ b/asterixdb/asterix-app/src/test/resources/dapd/denorm_user_event.aql
@@ -45,8 +45,8 @@
 
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
-declare dataset Users(UserType) primary key u_name on group1;
-declare dataset Events(EventType) primary key e_name on group1;
+declare dataset Users(UserType) primary key u_name with {"node-group":{"name":"group1"}};
+declare dataset Events(EventType) primary key e_name with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/denorm_user_event.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/q1.aql b/asterixdb/asterix-app/src/test/resources/dapd/q1.aql
index e0de0eb..b30641d 100644
--- a/asterixdb/asterix-app/src/test/resources/dapd/q1.aql
+++ b/asterixdb/asterix-app/src/test/resources/dapd/q1.aql
@@ -41,7 +41,7 @@
 
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
-declare dataset User(UserType) primary key name on group1;
+declare dataset User(UserType) primary key name with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql b/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
index 3b46729..0b8ea6c 100644
--- a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
@@ -55,7 +55,7 @@
 
 drop dataset Event;
 declare dataset Event(EventType)
-  primary key event_id on group1;
+  primary key event_id with {"node-group":{"name":"group1"}};
 
 load dataset Event
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
index dfd4d1f..88dc20f 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/mycustomers.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
index dea955e..a281084 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/mycustomers.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
index e2dca16..1c66f44 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custorder.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql
index e309fec..e295730 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/01-load-cust.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers from rainbow-01:"/home/hyracks/demo-data/customerData.json";
 //  delete dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql
index 60fe34c..ad3a3c4 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/02-filter-cust.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/hyracks/mycustomers.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql
index 5bc0242..299e2b5 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/03-load-ord.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 load dataset Orders from rainbow-01:"/home/hyracks/demo-data/orderData.json";
 // delete dataset Orders;
diff --git a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql
index 2c0a184..abe03f4 100644
--- a/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo0927/rainbow/04-join-custord.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/hyracks/custorder.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
index 768c844..78fb98a 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
index 5feb7ac..1127abe 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/mycustomers.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
index 6866f18..9dc69135b 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 load dataset Orders 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
index 90d5543..8033a5d 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custorder.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql
index 6a89f63..8858936 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/01-load-cust.aql
@@ -38,7 +38,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers from rainbow-01:"/home/onose/demo-data/customerData.adm";
 // drop dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql
index 2d6db81..2fb2740 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/03-load-ord.aql
@@ -30,6 +30,6 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 load dataset Orders from rainbow-01:"/home/onose/demo-data/orderData.adm";
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql
index ea6756a..0fd3e75 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/04-join-custord.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/onose/hyracks-rainbow/results/custorder.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql
index 4eb0312..db3c485 100644
--- a/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo1112/rainbow/05-count-custord.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/onose/hyracks-rainbow/results/custorder.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
index 12a0207..0665520 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
@@ -36,7 +36,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
index a4d27b1..c252b5a 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
@@ -36,7 +36,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/02-filter-cust.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
index 9ba6702..a4a6c4d 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
@@ -36,7 +36,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/03-count-cust-age.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
index b447d46..a9f6c6d 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 load dataset Orders 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
index a2e5eb1..722ea81 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/05-count-param1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
index e72a79d..67be87d 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
@@ -46,9 +46,9 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/06-count-custord.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
index b1dc420..94aafe0 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
- primary key id on group1;
+ primary key id with {"node-group":{"name":"group1"}};
 
 load dataset DBLP 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
index 1d7a2ca..e0f0234 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
- primary key id on group1;
+ primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/102-fuzzy-select.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
index df6f75a..8d953b8 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/110-self-join-dblp.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql
index 9762c2e..2154c97 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/02-filter-cust.aql
@@ -36,7 +36,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/onose/hyracks-rainbow/results/02-filter-cust.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql
index 3371aea..22d8b7b 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/05-count-param1.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to rainbow-01:"/home/onose/hyracks-rainbow/results/05-count-param1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql
index 1d865ff..d1efd80 100644
--- a/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/demo_aql/rainbow/101-load-dblp.aql
@@ -30,7 +30,7 @@
 declare nodegroup group1 on rainbow-01, rainbow-02, rainbow-03, rainbow-04, rainbow-05;
 
 declare dataset DBLP(DBLPType)
- primary key id on group1;
+ primary key id with {"node-group":{"name":"group1"}};
 
 load dataset DBLP from
   rainbow-01:"/home/onose/demo-data/dblp-id.txt" delimited by ":";
diff --git a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
index e3baaea..d8eb051 100644
--- a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 enlist dataset Customers;
 
diff --git a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
index a74bdae..7c27cb3 100644
--- a/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
index 64b9e35..5eb85d6 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/amerix.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
index 450ef16..114f9c9 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/dblp.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
index b601756..6c62d26 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'/tmp/dblp.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
index 85d29ce..fcceee1 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 // load dataset DBLP from asterix_nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
 load dataset DBLP 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
index 407f455..b59ada2 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
@@ -29,6 +29,6 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 drop dataset DBLP;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
index 3dea415..b97bfb7 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'/tmp/pub.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
index 28d08f3..ccebb9e 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
@@ -29,7 +29,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 // load dataset CSX from asterix_nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
 load dataset  CSX
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
index 03c0b00..3e48c17 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
@@ -29,6 +29,6 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 drop dataset CSX;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
index bbe1ad9..aad3065 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
@@ -31,7 +31,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'/tmp/pub.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
index c49131b..9c8e762 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
@@ -37,7 +37,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 declare dataset CSX(CSXType) 
   primary key id on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
index 802accf..bd8d48c 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
@@ -37,7 +37,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 declare dataset CSX(CSXType) 
   primary key id on group1;
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
index a73db6e..3051b11 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
@@ -28,7 +28,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
-  primary key uid on group1;
+  primary key uid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'/tmp/users.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
index d5634e7..2f3e103 100644
--- a/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
+++ b/asterixdb/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
@@ -28,7 +28,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Visitors(VisitorType) 
-  primary key vid on group1;
+  primary key vid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'/tmp/visitors.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
index 43f9417..9f4ac09 100644
--- a/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
+++ b/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
@@ -55,7 +55,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
-  primary key cid, name on group1;
+  primary key cid, name with {"node-group":{"name":"group1"}};
 
 create nodegroup group1 on asterix_nc1, asterix_nc2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
index 43f9417..9f4ac09 100644
--- a/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
@@ -55,7 +55,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
-  primary key cid, name on group1;
+  primary key cid, name with {"node-group":{"name":"group1"}};
 
 create nodegroup group1 on asterix_nc1, asterix_nc2;
 
diff --git a/asterixdb/asterix-app/src/test/resources/misc/split01.aql b/asterixdb/asterix-app/src/test/resources/misc/split01.aql
index 804611a..5b48a7a 100644
--- a/asterixdb/asterix-app/src/test/resources/misc/split01.aql
+++ b/asterixdb/asterix-app/src/test/resources/misc/split01.aql
@@ -48,9 +48,9 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/split01.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
index 67fa306..33e089c 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
@@ -35,7 +35,7 @@
 declare nodegroup group1 on asterix_nc1;
 
 declare dataset Dataverse(DataverseType)
-  primary key dataverseName on group1;
+  primary key dataverseName with {"node-group":{"name":"group1"}};
 
 for $c in dataset('Dataverse')
 return $c
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql
index 8919f97..e8fc76b 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/emp-load.aql
@@ -38,6 +38,6 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset Emp(EmpType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Emp from asterix_nc1:"/home/yasser/Dropbox/Research/data/EmpData.json";
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql
index a4638db..b4fa55f 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/join-01.aql
@@ -52,9 +52,9 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_join_1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql
index 6b0ba33..2bc4cbd 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/numeric-drop.aql
@@ -33,6 +33,6 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset Numeric(ExampleType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
   
 drop dataset Numeric;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql
index d36692f..d526f2f 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/ord-load.aql
@@ -33,6 +33,6 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/orderData.json";
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql
index c9c06989..b6bfbfd 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/spatial-scan.aql
@@ -34,7 +34,7 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset Spatial(ExampleType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_spatial_3.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql
index 9eaccdf..8db50fb 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltables-loadAsOpen.aql
@@ -57,21 +57,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 //load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
 //load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql
index 759c9c0..fc85cc2 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/alltablesAsopen-scan.aql
@@ -97,21 +97,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Desktop/result_scan.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql
index 6a9ce68..f3e6a8c 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-drop.aql
@@ -108,21 +108,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 drop dataset LineItems;
 //drop dataset Orders;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql
index bbb71d1..9ce82f5 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-load.aql
@@ -108,21 +108,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 //load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
 //load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql
index 6f39833..2d7dc47 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q1.aql
@@ -42,7 +42,7 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_1.adm";
  
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql
index 4ec89d7..c07998f 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q3.aql
@@ -67,9 +67,9 @@
 declare dataset LineItems(LineItemType)
   primary key l_orderkey, l_linenumber on group1;
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_3.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql
index 7640d2a..9e66584 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-q9.aql
@@ -92,17 +92,17 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_9.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql
index a861c09..66c30cc 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/closedtables-scan.aql
@@ -108,21 +108,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Desktop/result_scan.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql
index db51750..31a19c7 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-drop.aql
@@ -57,21 +57,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 drop dataset LineItems;
 //drop dataset Orders;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql
index 3b06aa0..89b2590 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-load.aql
@@ -57,21 +57,21 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 //load dataset LineItems from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/lineitem.json" pre-sorted;
 //load dataset Orders from asterix_nc1:"/home/yasser/Dropbox/Research/data/tpch_data/alldata/jsonformat/orders.json" pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql
index 1b3fd79..cd41928 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q1.aql
@@ -28,7 +28,7 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_open_1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql
index 98296f8..9c319eb 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q3.aql
@@ -36,7 +36,7 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
   primary key o_orderkey on group1;
 declare dataset Customers(CustomerType) 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql
index 94876a5..408c5a5f 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q5.aql
@@ -48,17 +48,17 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_open_5.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql
index d2642ee..dccef80 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/tpch/local/opentables-q9.aql
@@ -57,17 +57,17 @@
 set format "org.apache.asterix.runtime.formats.nontagged.NonTaggedDataFormat";
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/home/yasser/Dropbox/Research/data/results/result_tpch_closed_9.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql
index c3a2988..9cbd549 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-complex.aql
@@ -31,7 +31,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType) 
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset DBLP 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql
index fa272ef..fe0c6de 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/consolidate-selects-simple.aql
@@ -26,7 +26,7 @@
   c_address: string, 
   c_nationkey: int32, 
   c_phone: string, 
-  c_acctbal: double, 
+  c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
 }
@@ -34,7 +34,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/consolidate-selects-simple.aql";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/cust_group_no_agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/cust_group_no_agg.sqlpp
index 3c82655..3f64adf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/cust_group_no_agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/cust_group_no_agg.sqlpp
@@ -39,7 +39,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/.adm";
 select element name
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/denorm-cust-order.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/denorm-cust-order.sqlpp
index 508d6ec..5205324 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/denorm-cust-order.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/denorm-cust-order.sqlpp
@@ -57,9 +57,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key oid on group1;
+create  dataset Orders(OrderType) primary key oid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custorder.adm";
 select element {'cid':cid,'cust':(from g select c),'cnt-orders':count(o),'orders': (from g select o)}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql
index 1b3f930..cbc88ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-selflink.aql
@@ -46,8 +46,8 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
-create dataset DBLP(DBLPType) primary key id on group1;
-create dataset CSX(CSXType) primary key id on group1;
+create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
+create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'rttest/test.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql
index b0beb4d..166f305 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx-simple.aql
@@ -44,8 +44,8 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
-create dataset DBLP(DBLPType) primary key id on group1;
-create dataset CSX(CSXType) primary key id on group1;
+create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
+create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'rttest/fj-dblp-csx.adm';
 for $s in dataset('DBLP')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql
index c86c8b9..048df9e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-dblp-csx.aql
@@ -40,8 +40,8 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
-create dataset DBLP(DBLPType) primary key id on group1;
-create dataset CSX(CSXType) primary key id on group1;
+create dataset DBLP(DBLPType) primary key id with {"node-group":{"name":"group1"}};
+create dataset CSX(CSXType) primary key id with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:'rttest/fj-dblp-csx.adm';
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql
index 6ef16b5..9a436ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/fj-phase1.aql
@@ -37,10 +37,10 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Users(UserType) 
-  primary key uid on group1;
+  primary key uid with {"node-group":{"name":"group1"}};
 
 create dataset Visitors(VisitorType) 
-  primary key vid on group1;
+  primary key vid with {"node-group":{"name":"group1"}};
 
 
 // set simfunction "jaccard";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql
index f5537db..e0580a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inlined_q18_large_volume_customer.aql
@@ -67,11 +67,11 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 create dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/introhashpartitionmerge.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/introhashpartitionmerge.sqlpp
index 9921e58..67587dd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/introhashpartitionmerge.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/introhashpartitionmerge.sqlpp
@@ -33,7 +33,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
+create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/introhashpartitionmerge.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_01.sqlpp
index 0e7fc0b..9b5e045 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_01.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'l_partkey':li.l_partkey}
 from  LineItems as li,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_02.sqlpp
index 7247cdc..9c188bc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-super-key_02.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'l_partkey':li.l_partkey}
 from  PartSupp as ps,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_01.sqlpp
index 38bd3e3..3fe8de3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_01.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'li':li,'partsupp':partsupp}
 from  LineItems as li
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_02.sqlpp
index 9705785..d6254ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-super-key_02.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'partsupp':ps,'li':items}
 from  PartSupp as ps
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.sqlpp
index aae756c..001da3f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj2.sqlpp
@@ -72,11 +72,11 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/nested_loj.adm";
 select element {'cust':c,'orders':orders}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql
index 2deac67..4022e84 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested_loj3.aql
@@ -75,13 +75,13 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 create dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 create dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/nested_loj.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql
index 794a0ab..4ed67ae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby_ps.sqlpp
index 254bd26..7bebb74 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby_ps.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orderby-desc-using-gby_ps.sqlpp
@@ -47,7 +47,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm";
 set `compiler.sort.parallel` "true";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql
index 18ce36b..cd18239 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-aggreg.aql
@@ -34,7 +34,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key oid on group1;
+  primary key oid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/orders-aggreg.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01.sqlpp
index 190f2f2..b010a1f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01_ps.sqlpp
index 7764086..1c5bfaa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01_ps.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_01_ps.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02.sqlpp
index 64e2395..deb8b4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02_ps.sqlpp
index 3814e1c..f5f47b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02_ps.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive-open_02_ps.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01.sqlpp
index 4fe9e18..5243efd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01_ps.sqlpp
index 80cec87..5ecea40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01_ps.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_01_ps.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02.sqlpp
index c16810f..fa77884 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02_ps.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02_ps.sqlpp
index de4604e..cb60838 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02_ps.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-conjunctive_02_ps.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql
index 26f9d73..df3f03e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-index-only.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_Orders_Custkey on Orders(o_custkey);
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql
index 2e9095a..2857ed4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open-index-only.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_Orders_Custkey on Orders(o_custkey);
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql
index 9547e6a..8780af2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search-open.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_Orders_Custkey on Orders(o_custkey);
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql
index 3b49d9c..c464258 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/orders-index-search.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_Orders_Custkey on Orders(o_custkey);
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql
index f59d88a..de8dc87 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search-open.aql
@@ -39,7 +39,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 
 write output to asterix_nc1:"/tmp/prim_index_search.adm";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql
index acba88d..2d2f79c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/prim-idx-search.aql
@@ -39,7 +39,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 
 write output to asterix_nc1:"/tmp/prim_index_search.adm";
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/pull_select_above_eq_join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/pull_select_above_eq_join.sqlpp
index 8634de5..b03b85b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/pull_select_above_eq_join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/pull_select_above_eq_join.sqlpp
@@ -43,9 +43,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Users(UserType) primary key uid on group1;
+create  dataset Users(UserType) primary key uid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Visitors(VisitorType) primary key vid on group1;
+create  dataset Visitors(VisitorType) primary key vid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/pull-select-above-eq-join.adm";
 select element {'uid':user.uid,'vid':visitor.vid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push-project-through-group.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push-project-through-group.sqlpp
index 535ae58..7807359 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push-project-through-group.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push-project-through-group.sqlpp
@@ -36,7 +36,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/fuzzyjoin_080.adm";
 select element {'id':paperDBLP.id,'matches':matches}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql
index 1106cae..6198c45 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/push_limit.aql
@@ -34,7 +34,7 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/push_limit.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql
index fcc9def..3002280 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q03_shipping_priority.aql
@@ -67,11 +67,11 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 create dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql
index d90b699..7868fcc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q05_local_supplier_volume.aql
@@ -90,17 +90,17 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 create dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 create dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 create dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 create dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/tmp/q5_local_supplier.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql
index 2feb94f..17734e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q1.aql
@@ -45,7 +45,7 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
-create dataset User(UserType) primary key name on group1;
+create dataset User(UserType) primary key name with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q1.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql
index 15eb3ef..5e8018a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/q2.aql
@@ -52,7 +52,7 @@
 
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
-create dataset Event(EventType) primary key name on group1;
+create dataset Event(EventType) primary key name with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q2.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql
index ae8f860..b5f85b0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-2.aql
@@ -59,9 +59,9 @@
     asterix_nc1;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey with {"node-group":{"name":"group_test"}};
 
 declare function tmp()
 {
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql
index 78e93d8..e044e87 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-3.aql
@@ -59,9 +59,9 @@
     asterix_nc2;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey with {"node-group":{"name":"group_test"}};
 
 declare function tmp()
 {
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql
index 05b1c36..a811380 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343-4.aql
@@ -58,9 +58,9 @@
     asterix_nc1;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey with {"node-group":{"name":"group_test"}};
 
 create index lineitem_shipdateIx on LineItem (l_shipdate);
 create index lineitem_receiptdateIx on LineItem (l_receiptdate);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql
index f94f8b0..d99210d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-1343.aql
@@ -58,9 +58,9 @@
     asterix_nc1;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey with {"node-group":{"name":"group_test"}};
 
 declare function tmp()
 {
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql
index 54bcef1..2c1deb3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-index-only.aql
@@ -35,7 +35,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql
index 8e7420e..03acb15 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open-index-only.aql
@@ -35,7 +35,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql
index a79face..f0f2855 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index-open.aql
@@ -35,7 +35,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
index 5636d16..6a2b459 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
@@ -35,7 +35,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql
index 103ccb5..0e37727 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-all.aql
@@ -48,9 +48,9 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 create dataset LineID(LineIDType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 delete $l from dataset LineItems_q1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql
index 6ac940c..06a8a9e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete-rtree-secondary-index.aql
@@ -35,7 +35,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql
index c140021..4247764 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-delete.aql
@@ -49,9 +49,9 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 create dataset LineID(LineIDType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 delete $l from dataset LineItems_q1 where $l.l_shipdate <= '1998-09-02';
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql
index c1de7b7..f98d5c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert-secondary-index.aql
@@ -48,10 +48,10 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 create dataset LineID(LineIDType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_LineID_partkey on LineID(l_partkey);
 create index idx_LineID_suppkey on LineID(l_suppkey);
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql
index d501fc0..289d4f0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/scan-insert.aql
@@ -48,10 +48,10 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset LineItems_q1(LineItemType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 create dataset LineID(LineIDType)
-  primary key l_orderkey on group1;
+  primary key l_orderkey with {"node-group":{"name":"group1"}};
 
 insert into dataset LineID (
 for $l in dataset('LineItems_q1')
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
index eedaecb..734a3b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
@@ -41,7 +41,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset MyData(MyRecord)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 load dataset MyData 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql
index 3eda850..597fc13 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/sort-cust.aql
@@ -45,7 +45,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custlimit.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
index 03d105f..ff91548 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-complex.sqlpp
@@ -36,7 +36,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
 load  dataset DBLP using localfs ((`path`=`asterix_nc1://data/dblp-small/dblp-small-id.txt`),(`format`=`delimited-text`),(`delimiter`=`:`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
index 1ce7642..fcd5e68 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/consolidate-selects-simple.sqlpp
@@ -39,7 +39,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/consolidate-selects-simple.aql";
 select element c
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
index 3c82655..3f64adf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/cust_group_no_agg.sqlpp
@@ -39,7 +39,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/.adm";
 select element name
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
index 508d6ec..5205324 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/denorm-cust-order.sqlpp
@@ -57,9 +57,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key oid on group1;
+create  dataset Orders(OrderType) primary key oid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custorder.adm";
 select element {'cid':cid,'cust':(from g select c),'cnt-orders':count(o),'orders': (from g select o)}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
index e840882..812e6d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/distinct_aggregate.sqlpp
@@ -47,7 +47,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems_q1(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems_q1(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
 select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'count_suppkey':count(g)}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
index 66d3523..51c137c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp
@@ -45,9 +45,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset CSX(CSXType) primary key id on group1;
+create  dataset CSX(CSXType) primary key id WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/fj-dblp-csx.adm";
 select element {'idDBLP':idDBLP,'idCSX':idCSX}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
index 0b89b41..98a8dce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase1.sqlpp
@@ -41,9 +41,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Users(UserType) primary key uid on group1;
+create  dataset Users(UserType) primary key uid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Visitors(VisitorType) primary key vid on group1;
+create  dataset Visitors(VisitorType) primary key vid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/rares03.adm";
 select element {'uid':user.uid,'tokens':tokens}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
index f8c55e0..26af6b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/fj-phase2-with-hints.sqlpp
@@ -36,7 +36,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP_fuzzyjoin_078(DBLPType) primary key id on group1;
+create  dataset DBLP_fuzzyjoin_078(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/fuzzyjoin_078.adm";
 select element {'id':paperDBLP.id,'tokens':tokensDBLP}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
index 8d97b03..c806296 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/inlined_q18_large_volume_customer.sqlpp
@@ -72,11 +72,11 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
 select element {'c_name':c_name,'c_custkey':c_custkey,'o_orderkey':o_orderkey,'o_orderdate':o_orderdate,'o_totalprice':o_totalprice,'sum_quantity':inlined_q18_large_volume_customer.strict_sum((
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
index 103aae8..a9cf298 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/introhashpartitionmerge.sqlpp
@@ -33,7 +33,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
+create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/introhashpartitionmerge.adm";
 select element token2.rank
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
index 0e7fc0b..9b5e045 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_01.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'l_partkey':li.l_partkey}
 from  LineItems as li,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
index 7247cdc..9c188bc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/join-super-key_02.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/join-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'l_partkey':li.l_partkey}
 from  PartSupp as ps,
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
index 38bd3e3..3fe8de3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_01.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'li':li,'partsupp':partsupp}
 from  LineItems as li
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
index 9705785..d6254ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/loj-super-key_02.sqlpp
@@ -89,9 +89,9 @@
     asterix_nc2
 ;
 write output to asterix_nc1:"/tmp/loj-super-key_01.adm";
-create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_partkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 select element {'partsupp':ps,'li':items}
 from  PartSupp as ps
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
index aae756c..001da3f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj2.sqlpp
@@ -72,11 +72,11 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/nested_loj.adm";
 select element {'cust':c,'orders':orders}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
index b54dee6..0b460b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/nested_loj3.sqlpp
@@ -81,13 +81,13 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey on group1;
+create  dataset PartSupp(PartSuppType) primary key ps_partkey,ps_suppkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/nested_loj.adm";
 select element {'cust':c,'orders':orders}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
index 2313e90..6d349c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orderby-desc-using-gby.sqlpp
@@ -47,7 +47,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/gby-using-orderby-desc.adm";
 select element {'name':name,'age':age}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
index 5ef7be6..fd54dcb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-aggreg.sqlpp
@@ -37,7 +37,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key oid on group1;
+create  dataset Orders(OrderType) primary key oid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/orders-aggreg.adm";
 select element {'cid':cid,'ordpercust':`orders-aggreg`.strict_count(g),'totalcust':`orders-aggreg`.strict_sum((
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
index 190f2f2..b010a1f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_01.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
index 64e2395..deb8b4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive-open_02.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
index 4fe9e18..5243efd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_01.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
index c16810f..fa77884 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-conjunctive_02.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 load  dataset Orders using localfs ((`path`=`asterix_nc1://data/tpch0.001/orders.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
index 532f011..366d4b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search-open.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
index 99d8f81..b7d0368 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/orders-index-search.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 create  index idx_Orders_Custkey  on Orders (o_custkey) type btree;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
index 44c7aff..294cc85 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search-open.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/prim_index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
index 91bc4fc..4663c89 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/prim-idx-search.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/prim_index_search.adm";
 select element {'o_orderkey':o.o_orderkey,'o_custkey':o.o_custkey}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
index 8634de5..b03b85b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/pull_select_above_eq_join.sqlpp
@@ -43,9 +43,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Users(UserType) primary key uid on group1;
+create  dataset Users(UserType) primary key uid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Visitors(VisitorType) primary key vid on group1;
+create  dataset Visitors(VisitorType) primary key vid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/pull-select-above-eq-join.adm";
 select element {'uid':user.uid,'vid':visitor.vid}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
index 535ae58..7807359 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push-project-through-group.sqlpp
@@ -36,7 +36,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/fuzzyjoin_080.adm";
 select element {'id':paperDBLP.id,'matches':matches}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
index 721ad69..168c659 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/push_limit.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/push_limit.adm";
 select element {'price':o.o_totalprice,'date':o.o_orderdate}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
index 509ed18..90e7a13 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q03_shipping_priority.sqlpp
@@ -72,11 +72,11 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
 select element {'l_orderkey':l_orderkey,'revenue':revenue,'o_orderdate':o_orderdate,'o_shippriority':o_shippriority}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
index fd520e2..70288b2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q05_local_supplier_volume.sqlpp
@@ -98,17 +98,17 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber on group1;
+create  dataset LineItems(LineItemType) primary key l_orderkey,l_linenumber WITH {"node-group":{"name":"group1"}};
 
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key c_custkey on group1;
+create  dataset Customers(CustomerType) primary key c_custkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Suppliers(SupplierType) primary key s_suppkey on group1;
+create  dataset Suppliers(SupplierType) primary key s_suppkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Nations(NationType) primary key n_nationkey on group1;
+create  dataset Nations(NationType) primary key n_nationkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset Regions(RegionType) primary key r_regionkey on group1;
+create  dataset Regions(RegionType) primary key r_regionkey WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q5_local_supplier.adm";
 select element {'n_name':n_name,'revenue':revenue}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
index 145f018..791f0b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q1.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset User(UserType) primary key name on group1;
+create  dataset User(UserType) primary key name WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q1.adm";
 select element {'name':user.name}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
index 801f6a3..f2413ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/q2.sqlpp
@@ -54,7 +54,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Event(EventType) primary key name on group1;
+create  dataset Event(EventType) primary key name WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q2.adm";
 select element {'sig_name':sig_name,'total_count':sig_sponsorship_count,'chapter_breakdown':by_chapter}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
index 4300355..0b86e27 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index-open.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset MyData(MyRecord) primary key id on group1;
+create  dataset MyData(MyRecord) primary key id WITH {"node-group":{"name":"group1"}};
 
 load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
index 0748c99..ff8bbee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/rtree-secondary-index.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset MyData(MyRecord) primary key id on group1;
+create  dataset MyData(MyRecord) primary key id WITH {"node-group":{"name":"group1"}};
 
 load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
index daf328d..c126e4d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-all.sqlpp
@@ -54,8 +54,8 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems_q1(LineItemType) primary key l_orderkey on group1;
+create  dataset LineItems_q1(LineItemType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset LineID(LineIDType) primary key l_orderkey on group1;
+create  dataset LineID(LineIDType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
 delete from LineItems_q1;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
index 6493acd..eb4151b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete-rtree-secondary-index.sqlpp
@@ -40,7 +40,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset MyData(MyRecord) primary key id on group1;
+create  dataset MyData(MyRecord) primary key id WITH {"node-group":{"name":"group1"}};
 
 load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
index 83c12e0..c41401a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-delete.sqlpp
@@ -54,9 +54,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems_q1(LineItemType) primary key l_orderkey on group1;
+create  dataset LineItems_q1(LineItemType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset LineID(LineIDType) primary key l_orderkey on group1;
+create  dataset LineID(LineIDType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
 delete from LineItems_q1
  where l_shipdate <= '1998-09-02';
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
index b5e9c66..f3b5a85 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert-secondary-index.sqlpp
@@ -54,9 +54,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems_q1(LineItemType) primary key l_orderkey on group1;
+create  dataset LineItems_q1(LineItemType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset LineID(LineIDType) primary key l_orderkey on group1;
+create  dataset LineID(LineIDType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
 create  index idx_LineID_partkey  on LineID (l_partkey) type btree;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
index 0bda7a0..f4ef35f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/scan-insert.sqlpp
@@ -54,9 +54,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset LineItems_q1(LineItemType) primary key l_orderkey on group1;
+create  dataset LineItems_q1(LineItemType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
-create  dataset LineID(LineIDType) primary key l_orderkey on group1;
+create  dataset LineID(LineIDType) primary key l_orderkey WITH {"node-group":{"name":"group1"}};
 
 insert into LineID
 select element {'l_orderkey':l.l_orderkey,'l_partkey':l.l_partkey,'l_suppkey':l.l_partkey}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
index 00ec8dc..58934cb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/skip-index/skip-rtree-secondary-index.sqlpp
@@ -45,7 +45,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset MyData(MyRecord) primary key id on group1;
+create  dataset MyData(MyRecord) primary key id WITH {"node-group":{"name":"group1"}};
 
 load  dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),("format"="adm")) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
index b2e78c0..5ce4d75 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/sort-cust.sqlpp
@@ -47,7 +47,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/custlimit.adm";
 select element {'custname':c.name,'custage':c.age}
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
index 3bdae74..e9a7228 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/unnest_list_in_subplan.sqlpp
@@ -42,9 +42,9 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank on group1;
+create  dataset TOKENSRANKEDADM(TOKENSRANKEDADMType) primary key rank WITH {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"rttest/unnest_list_in_subplan.adm";
 select element {'id':idDBLP,'tokens':tokensDBLP}
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
index b2d7d22..f7550db 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
@@ -42,6 +42,6 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 drop dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql b/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
index 2b4a33c..5d6ca9b 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
@@ -42,7 +42,7 @@
 create nodegroup group1  if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 load dataset Customers 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
index df43aa5..144a804 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
@@ -46,6 +46,6 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
 drop  dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
index 66c1b68..5ecb455 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
@@ -46,7 +46,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
 load  dataset Customers using localfs ((`path`=`asterix_nc1:///tmp/customerData.json`),(`format`=`adm`)) pre-sorted;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.aql
index f53e3cf..bb78142 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.aql
@@ -43,8 +43,9 @@
     asterix_nc1;
 
 create dataset TweetMessages(TweetMessageType)
-primary key tweetid on group_test
-hints(cardinality=100);
+primary key tweetid
+hints(cardinality=100)
+with {"node-group":{"name":"group_test"}};
 
 create index twTimeIdx on TweetMessages(send-time) type btree;
 create index twLocationIdx on TweetMessages(user.sender-location) type rtree;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.aql
index 3756b81..fdb0fd9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.aql
@@ -38,5 +38,5 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
index db7944e..47c6f44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
@@ -35,8 +35,8 @@
 }
 
 create dataset DBLPtmp(DBLPNestedType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
index fc549fa..7eae3b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
@@ -35,8 +35,8 @@
 }
 
 create dataset DBLPtmp(DBLPNestedType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql
index 01f4465..c6b4f5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.aql
@@ -42,8 +42,8 @@
 create nodegroup group1 if not exists on asterix_nc1;
 
 create dataset Customerstmp(CustomerTypetmp)
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
  create dataset Customers(CustomerType)
-  primary key nested.cid on group1;
+  primary key nested.cid with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql
index 01f4465..c6b4f5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.aql
@@ -42,8 +42,8 @@
 create nodegroup group1 if not exists on asterix_nc1;
 
 create dataset Customerstmp(CustomerTypetmp)
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
  create dataset Customers(CustomerType)
-  primary key nested.cid on group1;
+  primary key nested.cid with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql
index 01f4465..c6b4f5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.aql
@@ -42,8 +42,8 @@
 create nodegroup group1 if not exists on asterix_nc1;
 
 create dataset Customerstmp(CustomerTypetmp)
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
  create dataset Customers(CustomerType)
-  primary key nested.cid on group1;
+  primary key nested.cid with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql
index e917368..94f7424 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1;
 
 create dataset Customerstmp(CustomerTypetmp)
-  primary key cid on group1;
+  primary key cid with {"node-group":{"name":"group1"}};
 
 create dataset Customers(CustomerType)
-  primary key nested.cid on group1;
+  primary key nested.cid with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
index 04110dc..b68602f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
@@ -35,7 +35,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
index 373a9a8..c6cb973 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
index eaa7e99..d0e66d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
@@ -42,8 +42,8 @@
 }
 
 create dataset DBLPtmp(DBLPClosedType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
index 6652c23..de5115a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
index 72bbfbd..f2962b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
@@ -43,8 +43,8 @@
 }
 
 create dataset DBLPtmp(DBLPClosedType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
index 6652c23..de5115a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
index 373a9a8..c6cb973 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
index 373a9a8..c6cb973 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
index 373a9a8..c6cb973 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
@@ -42,7 +42,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPTypetmp)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPType)
-  primary key nested.id on group1;
+  primary key nested.id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
index 0afaafe..a31921c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.aql
@@ -38,8 +38,8 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
index 636d441..602a8ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.aql
@@ -39,8 +39,8 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
index aab1c81..dc9e577 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
index 9cb239f..0543140 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.aql
@@ -38,8 +38,8 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLPtmp(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLP(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
index 387dade..a722cc3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.aql
@@ -38,6 +38,6 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
index 0afaafe..a31921c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.aql
@@ -38,8 +38,8 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
index 38261d7..1007570 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
index 38261d7..1007570 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.aql
@@ -38,7 +38,7 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.aql
index f32bae0..f5ff5c8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.aql
@@ -38,6 +38,6 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id with {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.aql
index bffda72..0243d35 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/tpch/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.aql
@@ -111,6 +111,6 @@
     asterix_nc1;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey with {"node-group":{"name":"group_test"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/composite-key/composite-low-high/composite-low-high.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/composite-key/composite-low-high/composite-low-high.1.ddl.sqlpp
index 735666b..01a82ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/composite-key/composite-low-high/composite-low-high.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/composite-key/composite-low-high/composite-low-high.1.ddl.sqlpp
@@ -40,4 +40,4 @@
 
 create dataset Points(PointType)
 primary key x, y
-on group_test;
+WITH {"node-group":{"name":"group_test"}};;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.sqlpp
index f337543..2051275 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/intersection_with_nodegroup/intersection_with_nodegroup.1.ddl.sqlpp
@@ -43,8 +43,9 @@
     asterix_nc1;
 
 create dataset TweetMessages(TweetMessageType)
-primary key tweetid on group_test
-hints(cardinality=100);
+primary key tweetid
+hints(cardinality=100)
+WITH {"node-group":{"name":"group_test"}};
 
 create index twTimeIdx on TweetMessages(`send-time`) type btree;
 create index twLocationIdx on TweetMessages(user.`sender-location`) type rtree;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.sqlpp
index fb4c9cb..508757a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-with-two-ngram-index/inverted-index-ngram-edit-distance-with-two-ngram-index.1.ddl.sqlpp
@@ -38,6 +38,6 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id WITH {"node-group":{"name":"group1"}};
 
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
index f25e779..1390c3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
@@ -47,5 +47,5 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
index f25e779..1390c3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
@@ -47,5 +47,5 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
index f25e779..1390c3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
@@ -47,5 +47,5 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
index 97e4c49..c920201 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
@@ -47,5 +47,5 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customers(CustomerType) primary key cid on group1;
+create  dataset Customers(CustomerType) primary key cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
index 2d91636..825a391 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.1.ddl.sqlpp
@@ -40,5 +40,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset Orders(OrderType) primary key o_orderkey on group1;
+create  dataset Orders(OrderType) primary key o_orderkey WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index 31cbd0f..69c3d12 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   nested : DBLPNestedType
 };
 
-create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPNestedType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index d1ba662..9e3c7be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -41,7 +41,7 @@
   nested : DBLPNestedType
 };
 
-create  dataset DBLPtmp(DBLPNestedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPNestedType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
index 76506fd..4932563 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.1.ddl.sqlpp
@@ -52,7 +52,7 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
index 76506fd..4932563 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.1.ddl.sqlpp
@@ -52,7 +52,7 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
index 76506fd..4932563 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.1.ddl.sqlpp
@@ -52,7 +52,7 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
index 38695e6..0949401 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.1.ddl.sqlpp
@@ -52,7 +52,7 @@
 create  nodegroup group1 if not exists  on
     asterix_nc1
 ;
-create  dataset Customerstmp(CustomerTypetmp) primary key cid on group1;
+create  dataset Customerstmp(CustomerTypetmp) primary key cid WITH {"node-group":{"name":"group1"}};
 
-create  dataset Customers(CustomerType) primary key nested.cid on group1;
+create  dataset Customers(CustomerType) primary key nested.cid WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 710cb66..2109967 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -41,7 +41,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 04a8caa..ab18ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index fa5931a..0854f76 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -49,7 +49,7 @@
   nested : DBLPOpenType
 };
 
-create  dataset DBLPtmp(DBLPClosedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPClosedType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index db282da..56055de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index fa5931a..0854f76 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -49,7 +49,7 @@
   nested : DBLPOpenType
 };
 
-create  dataset DBLPtmp(DBLPClosedType) primary key id on group1;
+create  dataset DBLPtmp(DBLPClosedType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index db282da..56055de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 04a8caa..ab18ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 04a8caa..ab18ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 04a8caa..ab18ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -49,7 +49,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPTypetmp) primary key id on group1;
+create  dataset DBLPtmp(DBLPTypetmp) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPType) primary key nested.id on group1;
+create  dataset DBLP(DBLPType) primary key nested.id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
index 199b34c..458b048 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
index c5af04a..95678af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPType) primary key id on group1;
+create  dataset DBLPtmp(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPOpenType) primary key id on group1;
+create  dataset DBLP(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
index 412bd06..ae1176a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
index c5af04a..95678af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLPtmp(DBLPType) primary key id on group1;
+create  dataset DBLPtmp(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLP(DBLPOpenType) primary key id on group1;
+create  dataset DBLP(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
index 412bd06..ae1176a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
index 199b34c..458b048 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
index 199b34c..458b048 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
index 199b34c..458b048 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.1.ddl.sqlpp
@@ -44,7 +44,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
-create  dataset DBLPOpen(DBLPOpenType) primary key id on group1;
+create  dataset DBLPOpen(DBLPOpenType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.sqlpp
index ebe24c2..1077f44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/open-index-enforced/index-selection/multi-index/multi-index.1.ddl.sqlpp
@@ -38,6 +38,6 @@
 create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset DBLP(DBLPType)
-  primary key id on group1;
+  primary key id WITH {"node-group":{"name":"group1"}};
 create dataset DBLPOpen(DBLPOpenType)
-  primary key id on group1;
+  primary key id WITH {"node-group":{"name":"group1"}};
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
index 8778274..144226c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
index 9bf6d4d..095d3dd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.1.ddl.sqlpp
@@ -36,5 +36,5 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset DBLP(DBLPType) primary key id on group1;
+create  dataset DBLP(DBLPType) primary key id WITH {"node-group":{"name":"group1"}};
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
index d9fb7ec..482d2a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.1.ddl.sqlpp
@@ -36,7 +36,7 @@
     asterix_nc1,
     asterix_nc2
 ;
-create  dataset TwitterData(Tweet) primary key id on group1;
+create  dataset TwitterData(Tweet) primary key id WITH {"node-group":{"name":"group1"}};
 
 create  index rtree_index_point  on TwitterData (loc) type rtree;
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
index 5fbc67b..26a7e56 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-with-index/q04_order_priority_with_nodegroup/q04_order_priority_with_nodegroup.1.ddl.sqlpp
@@ -121,9 +121,9 @@
     asterix_nc1;
 
 create dataset LineItem(LineItemType)
-  primary key l_orderkey, l_linenumber on group_test;
+  primary key l_orderkey, l_linenumber WITH {"node-group":{"name":"group_test"}};
 create dataset Orders(OrderType)
-  primary key o_orderkey on group_test;
+  primary key o_orderkey WITH {"node-group":{"name":"group_test"}};
 
 create index lineitem_shipdateIx on LineItem (l_shipdate);
 create index lineitem_receiptdateIx on LineItem (l_receiptdate);
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql
index 650bd33..9bf9403 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/enlist_data.aql
@@ -107,21 +107,21 @@
   asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 
 enlist dataset Customers;
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql
index 5318479..41161af 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_adm.aql
@@ -107,21 +107,21 @@
   asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 
 load dataset LineItems 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql
index 83600b9..eec9c69 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_100x.aql
@@ -107,21 +107,21 @@
   asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 
 load dataset Customers 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql
index bbd823f..55c8f03 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/load_data_tbl_1x.aql
@@ -107,21 +107,21 @@
   asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 
 load dataset Customers 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql
index b85bef5..3e53ea6 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/asterix/q03_shipping_priority.aql
@@ -64,11 +64,11 @@
       asterix-005, asterix-006, asterix-007, asterix-008, asterix-009, asterix-010;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix-001:"/home/onose/hyracks-asterix/results/q3_shipping_priority.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql
index 3986f00..7d391f5 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/inlined_q18_large_volume_customer.aql
@@ -63,11 +63,11 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/inlined_q18_large_volume_customer.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql
index 28559cd..d2512a0 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_adm_data.aql
@@ -106,21 +106,21 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 load dataset LineItems 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql
index 3f081f3..cab0315 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_0.001x_2nodes.aql
@@ -106,21 +106,21 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 load dataset LineItems 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql
index f4cbbb6..0c55e17 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_10x_1node.aql
@@ -106,21 +106,21 @@
 declare nodegroup group1 on asterix_nc1;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 load dataset LineItems 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql
index 5eb5d79..606f6b8 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_1x_1node.aql
@@ -106,21 +106,21 @@
 declare nodegroup group1 on asterix_nc1;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 load dataset LineItems 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql
index 5bad6f9..5bfa238 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/load_tbl_data_20x_2node.aql
@@ -106,21 +106,21 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
 
 load dataset LineItems 
 using localfs
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql
index 0938de7..bfec649 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-create.aql
@@ -35,6 +35,6 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 create index idx_Orders_Custkey on Orders(o_custkey);
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql
index 0a4c208..d473058 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/orders-index-search.aql
@@ -35,7 +35,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 
 declare index idx_Orders_Custkey on Orders(o_custkey);
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql
index a9248b4..e05c636 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q01_pricing_summary_report.aql
@@ -40,7 +40,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 
 // for external datasets, use:
 //
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql
index 005b887..4f1199c 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q03_shipping_priority.aql
@@ -63,11 +63,11 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 
 write output to asterix_nc1:"/tmp/q3_shipping_priority.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql
index 0a4d752..1832129 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q05_local_supplier_volume.aql
@@ -86,17 +86,17 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Regions(RegionType)
-  primary key r_regionkey on group1;
+  primary key r_regionkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/tmp/q5_local_supplier_volume.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql
index b603363..6638e7a 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/q09_product_type_profit.aql
@@ -90,17 +90,17 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Suppliers(SupplierType)
-  primary key s_suppkey on group1;
+  primary key s_suppkey with {"node-group":{"name":"group1"}};
 declare dataset Nations(NationType) 
-  primary key n_nationkey on group1;
+  primary key n_nationkey with {"node-group":{"name":"group1"}};
 declare dataset Parts(PartType)
-  primary key p_partkey on group1;
+  primary key p_partkey with {"node-group":{"name":"group1"}};
 declare dataset PartSupp(PartSuppType)
-  primary key ps_partkey, ps_suppkey on group1;  
+  primary key ps_partkey, ps_suppkey with {"node-group":{"name":"group1"}};
   
 write output to asterix_nc1:"/tmp/q9_product_type_profit.adm";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql
index e851841..25bb8d0 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/scan_filter_lineitem.aql
@@ -40,7 +40,7 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 
 // load dataset LineItems from asterix_nc1:"/opt/tpch/tengigs/lineitem.tbl" delimited by "|";
 
diff --git a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql
index a205199..6c67591 100644
--- a/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql
+++ b/asterixdb/asterix-app/src/test/resources/tpch/queries/local/write-custorder.aql
@@ -68,13 +68,13 @@
 declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset LineItems(LineItemType)
-  primary key l_orderkey, l_linenumber on group1;
+  primary key l_orderkey, l_linenumber with {"node-group":{"name":"group1"}};
 declare dataset Orders(OrderType)
-  primary key o_orderkey on group1;
+  primary key o_orderkey with {"node-group":{"name":"group1"}};
 declare dataset Customers(CustomerType) 
-  primary key c_custkey on group1;
+  primary key c_custkey with {"node-group":{"name":"group1"}};
 declare dataset CustOrder(CustOrderType)
-  primary key co_custkey on group1;
+  primary key co_custkey with {"node-group":{"name":"group1"}};
 
 insert into dataset CustOrder 
 ( for $c in dataset('Customers')
diff --git a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
index b9a489d..67816c5 100644
--- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
+++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
@@ -504,7 +504,6 @@
   Map<String,String> properties = null;
   FunctionSignature appliedFunction = null;
   Pair<List<Integer>, List<List<String>>> primaryKeyFields = null;
-  String nodeGroupName = null;
   Map<String,String> hints = new HashMap<String,String>();
   DatasetDecl dsetDecl = null;
   boolean autogenerated = false;
@@ -517,7 +516,6 @@
     <LEFTPAREN> typeComponents = TypeName() <RIGHTPAREN>
     ifNotExists = IfNotExists()
     <USING> adapterName = AdapterName() properties = Configuration()
-    ( <ON> nodeGroupName = Identifier() )?
     ( <HINTS> hints = Properties() )?
     ( <WITH> withRecord = RecordConstructor() )?
       {
@@ -529,7 +527,6 @@
               nameComponents.second,
               new TypeReferenceExpression(typeComponents),
               null,
-              nodeGroupName != null? new Identifier(nodeGroupName): null,
               hints,
               DatasetType.EXTERNAL,
               edd,
@@ -557,7 +554,6 @@
     ifNotExists = IfNotExists()
     primaryKeyFields = PrimaryKey()
     ( <AUTOGENERATED> { autogenerated = true; } )?
-    ( <ON> nodeGroupName = Identifier() )?
     ( <HINTS> hints = Properties() )?
     ( LOOKAHEAD(2) <WITH> <FILTER> <ON> filterField = NestedField() )?
     ( <WITH> withRecord = RecordConstructor() )?
@@ -574,7 +570,6 @@
                                    nameComponents.second,
                                    new TypeReferenceExpression(typeComponents),
                                    metaTypeComponents != null ? new TypeReferenceExpression(metaTypeComponents) : null,
-                                   nodeGroupName != null ? new Identifier(nodeGroupName) : null,
                                    hints,
                                    DatasetType.INTERNAL,
                                    idd,
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
index c0ad1b8..942e39b 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/DatasetDecl.java
@@ -40,7 +40,6 @@
     protected final DataverseName dataverse;
     protected final TypeExpression itemType;
     protected final TypeExpression metaItemType;
-    protected final Identifier nodegroupName;
     protected final DatasetType datasetType;
     protected final IDatasetDetailsDecl datasetDetailsDecl;
     protected final Map<String, String> hints;
@@ -48,13 +47,12 @@
     protected final boolean ifNotExists;
 
     public DatasetDecl(DataverseName dataverse, Identifier name, TypeExpression itemType, TypeExpression metaItemType,
-            Identifier nodeGroupName, Map<String, String> hints, DatasetType datasetType, IDatasetDetailsDecl idd,
-            RecordConstructor withRecord, boolean ifNotExists) throws CompilationException {
+            Map<String, String> hints, DatasetType datasetType, IDatasetDetailsDecl idd, RecordConstructor withRecord,
+            boolean ifNotExists) throws CompilationException {
         this.dataverse = dataverse;
         this.name = name;
         this.itemType = itemType;
         this.metaItemType = metaItemType;
-        this.nodegroupName = nodeGroupName;
         this.hints = hints;
         this.withObjectNode = DatasetDeclParametersUtil.validateAndGetWithObjectNode(withRecord, datasetType);
         this.ifNotExists = ifNotExists;
@@ -86,8 +84,12 @@
         return metaItemType;
     }
 
-    public Identifier getNodegroupName() {
-        return nodegroupName;
+    public String getNodegroupName() {
+        AdmObjectNode nodeGroupObj = (AdmObjectNode) withObjectNode.get(DatasetDeclParametersUtil.NODE_GROUP_NAME);
+        if (nodeGroupObj == null) {
+            return null;
+        }
+        return nodeGroupObj.getOptionalString(DatasetDeclParametersUtil.NODE_GROUP_NAME_PARAMETER_NAME);
     }
 
     private AdmObjectNode getMergePolicyObject() {
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/DatasetDeclParametersUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/DatasetDeclParametersUtil.java
index 52285d9..552ca39 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/DatasetDeclParametersUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/DatasetDeclParametersUtil.java
@@ -52,6 +52,12 @@
     public static final String STORAGE_BLOCK_COMPRESSION_SCHEME_PARAMETER_NAME = "scheme";
 
     /* ***********************************************
+     * Node Group Parameters
+     * ***********************************************
+     */
+    public static final String NODE_GROUP_NAME = "node-group";
+    public static final String NODE_GROUP_NAME_PARAMETER_NAME = "name";
+    /* ***********************************************
      * Private members
      * ***********************************************
      */
@@ -79,9 +85,11 @@
     }
 
     private static ARecordType getWithObjectType() {
-        final String[] withNames = { MERGE_POLICY_PARAMETER_NAME, STORAGE_BLOCK_COMPRESSION_PARAMETER_NAME };
+        final String[] withNames =
+                { MERGE_POLICY_PARAMETER_NAME, STORAGE_BLOCK_COMPRESSION_PARAMETER_NAME, NODE_GROUP_NAME };
         final IAType[] withTypes = { AUnionType.createUnknownableType(getMergePolicyType()),
-                AUnionType.createUnknownableType(getStorageBlockCompressionType()) };
+                AUnionType.createUnknownableType(getStorageBlockCompressionType()),
+                AUnionType.createUnknownableType(getNodeGroupType()) };
         return new ARecordType("withObject", withNames, withTypes, false);
     }
 
@@ -113,4 +121,10 @@
         final IAType[] schemeType = { BuiltinType.ASTRING };
         return new ARecordType(STORAGE_BLOCK_COMPRESSION_PARAMETER_NAME, schemeName, schemeType, false);
     }
+
+    private static ARecordType getNodeGroupType() {
+        final String[] schemeName = { NODE_GROUP_NAME_PARAMETER_NAME };
+        final IAType[] schemeType = { BuiltinType.ASTRING };
+        return new ARecordType(NODE_GROUP_NAME, schemeName, schemeType, false);
+    }
 }
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
index c093005..7c5e8be 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
@@ -455,9 +455,9 @@
             out.print(" using " + revertStringToQuoted(externalDetails.getAdapter()));
             printConfiguration(externalDetails.getProperties());
         }
-        Identifier nodeGroupName = dd.getNodegroupName();
+        String nodeGroupName = dd.getNodegroupName();
         if (nodeGroupName != null) {
-            out.print(" on " + nodeGroupName.getValue());
+            out.print(" on " + nodeGroupName);
         }
         Map<String, String> hints = dd.getHints();
         if (dd.getHints().size() > 0) {
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index e23ea59..5cdf1a7 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -773,7 +773,6 @@
   TypeExpression typeExpr = null;
   TypeExpression metaTypeExpr = null;
   Pair<List<Integer>, List<List<String>>> primaryKeyFields = null;
-  String nodeGroupName = null;
   Map<String,String> hints = new HashMap<String,String>();
   DatasetDecl stmt = null;
   boolean autogenerated = false;
@@ -798,7 +797,6 @@
   ifNotExists = IfNotExists()
   primaryKeyFields = PrimaryKey()
   (<AUTOGENERATED> { autogenerated = true; } )?
-  (<ON> nodeGroupName = Identifier() )?
   ( <HINTS> hints = Properties() )?
   ( LOOKAHEAD(2) <WITH> <FILTER> <ON>  filterField = NestedField() )?
   ( <WITH> withRecord = RecordConstructor() )?
@@ -810,9 +808,8 @@
     InternalDetailsDecl idd = new InternalDetailsDecl(primaryKeyFields.second, primaryKeyFields.first, autogenerated,
       filterField == null? null : filterField.second);
     try {
-      stmt = new DatasetDecl(nameComponents.first, nameComponents.second, typeExpr, metaTypeExpr,
-        nodeGroupName != null ? new Identifier(nodeGroupName) : null, hints, DatasetType.INTERNAL, idd, withRecord,
-        ifNotExists);
+      stmt = new DatasetDecl(nameComponents.first, nameComponents.second, typeExpr, metaTypeExpr, hints,
+        DatasetType.INTERNAL, idd, withRecord, ifNotExists);
       return addSourceLocation(stmt, startStmtToken);
     } catch (CompilationException e) {
        throw new SqlppParseException(getSourceLocation(startStmtToken), e.getMessage());
@@ -827,7 +824,6 @@
   boolean ifNotExists = false;
   String adapterName = null;
   Map<String,String> properties = null;
-  String nodeGroupName = null;
   Map<String,String> hints = new HashMap<String,String>();
   DatasetDecl stmt = null;
   RecordConstructor withRecord = null;
@@ -837,7 +833,6 @@
   typeExpr = DatasetTypeSpecification()
   ifNotExists = IfNotExists()
   <USING> adapterName = AdapterName() properties = Configuration()
-  ( <ON> nodeGroupName = Identifier() )?
   ( <HINTS> hints = Properties() )?
   ( <WITH> withRecord = RecordConstructor() )?
   {
@@ -845,9 +840,8 @@
     edd.setAdapter(adapterName);
     edd.setProperties(properties);
     try {
-      stmt = new DatasetDecl(nameComponents.first, nameComponents.second, typeExpr, null,
-        nodeGroupName != null? new Identifier(nodeGroupName): null, hints, DatasetType.EXTERNAL, edd, withRecord,
-        ifNotExists);
+      stmt = new DatasetDecl(nameComponents.first, nameComponents.second, typeExpr, null, hints, DatasetType.EXTERNAL,
+        edd, withRecord, ifNotExists);
       return addSourceLocation(stmt, startStmtToken);
     } catch (CompilationException e) {
        throw new SqlppParseException(getSourceLocation(startStmtToken), e.getMessage());