diff --git a/src/grammar/functions.ts b/src/grammar/functions.ts
index 646205b..8b19b22 100644
--- a/src/grammar/functions.ts
+++ b/src/grammar/functions.ts
@@ -250,6 +250,8 @@ export const aggregateFunctions: string[] = [
   "first",
   "first_not_null",
   "geomean",
+  "grouping",
+  "grouping_id",
   "haversine_dist_deg",
   "ksum",
   "kurtosis",
diff --git a/src/grammar/keywords.ts b/src/grammar/keywords.ts
index faf530e..ef345e2 100644
--- a/src/grammar/keywords.ts
+++ b/src/grammar/keywords.ts
@@ -44,6 +44,7 @@ export const keywords: string[] = [
   "copy",
   "create",
   "cross",
+  "cube",
   "cumulative",
   "current",
   "data_page_size",
@@ -85,6 +86,7 @@ export const keywords: string[] = [
   "full",
   "grant",
   "group",
+  "grouping",
   "groups",
   "header",
   "horizon",
@@ -176,6 +178,7 @@ export const keywords: string[] = [
   "revoke",
   "right",
   "role",
+  "rollup",
   "row",
   "row_group_size",
   "rows",
@@ -183,6 +186,7 @@ export const keywords: string[] = [
   "select",
   "service",
   "set",
+  "sets",
   "show",
   "skip",
   "snapshot",