diff --git a/src/functions.ts b/src/functions.ts
index 549292a..a6de6ef 100644
--- a/src/functions.ts
+++ b/src/functions.ts
@@ -45,6 +45,7 @@ export default [
   "dump_thread_stacks",
   "extract",
   "first",
+  "first_value",
   "floor",
   "flush_query_cache",
   "format",
diff --git a/src/keywords.ts b/src/keywords.ts
index 7210906..e59644e 100644
--- a/src/keywords.ts
+++ b/src/keywords.ts
@@ -49,6 +49,7 @@ export default [
   "explain",
   "fill",
   "foreign",
+  "following",
   "from",
   "grant",
   "group",
@@ -110,7 +111,9 @@ export default [
   "resume",
   "revoke",
   "right",
+  "range",
   "row",
+  "rows",
   "sample",
   "select",
   "set",