diff --git a/src/grammar/functions.ts b/src/grammar/functions.ts
index 32feb97..0ec017b 100644
--- a/src/grammar/functions.ts
+++ b/src/grammar/functions.ts
@@ -89,6 +89,8 @@ export const functions: string[] = [
   "geomean",
   "glob",
   "greatest",
+  "grouping",
+  "grouping_id",
   "haversine_dist_deg",
   "headers",
   "hour",
diff --git a/src/grammar/keywords.ts b/src/grammar/keywords.ts
index bfe2e3a..10c6b17 100644
--- a/src/grammar/keywords.ts
+++ b/src/grammar/keywords.ts
@@ -38,6 +38,7 @@ export const keywords: string[] = [
   "copy",
   "create",
   "cross",
+  "cube",
   "cumulative",
   "current",
   "data_page_size",
@@ -76,6 +77,7 @@ export const keywords: string[] = [
   "full",
   "grant",
   "group",
+  "grouping",
   "groups",
   "header",
   "horizon",
@@ -153,6 +155,7 @@ export const keywords: string[] = [
   "resume",
   "revoke",
   "right",
+  "rollup",
   "row",
   "row_group_size",
   "rows",
@@ -160,6 +163,7 @@ export const keywords: string[] = [
   "select",
   "service",
   "set",
+  "sets",
   "show",
   "skip",
   "snapshot",