diff --git a/go.mod b/go.mod
index e213acb..e671f96 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,8 @@ module github.com/kwilteam/kuneiform
 go 1.21
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9
 	github.com/antlr4-go/antlr/v4 v4.13.0
-	github.com/kwilteam/kwil-db/parse v0.1.1-0.20240226173130-3422cd30c05d
+	github.com/kwilteam/kwil-db/parse v0.1.1
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4
 )
@@ -14,8 +13,8 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/kwilteam/action-grammar-go v0.0.1-0.20240223223553-06cc155ff15a // indirect
-	github.com/kwilteam/sql-grammar-go v0.0.3-0.20240223223614-ea432d95ecc7 // indirect
+	github.com/kwilteam/action-grammar-go v0.1.0 // indirect
+	github.com/kwilteam/sql-grammar-go v0.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
diff --git a/go.sum b/go.sum
index bb44974..80886b2 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 h1:goHVqTbFX3AIo0tzGr14pgfAW2ZfPChKO21Z9MGf/gk=
-github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -12,12 +10,12 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kwilteam/action-grammar-go v0.0.1-0.20240223223553-06cc155ff15a h1:U+DcOIZKJSVAA6HBvvdWOgQeP02+OjiKXhyZHzXkF3g=
-github.com/kwilteam/action-grammar-go v0.0.1-0.20240223223553-06cc155ff15a/go.mod h1:hHGHtnrJpASW9P+F7pdr/EP2M1Hxy1N9Wx/TmjVdV6I=
-github.com/kwilteam/kwil-db/parse v0.1.1-0.20240226173130-3422cd30c05d h1:TUCEjnrwn09BY2aCnq/Wwy3h28IS8Dq98iIznqqe90o=
-github.com/kwilteam/kwil-db/parse v0.1.1-0.20240226173130-3422cd30c05d/go.mod h1:XcbpqWRKV0z/0EF0EXCqqnDir+X1oEE+haQQrIQLBxQ=
-github.com/kwilteam/sql-grammar-go v0.0.3-0.20240223223614-ea432d95ecc7 h1:v3q6dFdNqNtIZg9iX3zafRCoH4UFNi73DEc1ik32AwM=
-github.com/kwilteam/sql-grammar-go v0.0.3-0.20240223223614-ea432d95ecc7/go.mod h1:A9AXaH5Vl/uPsY88fWqvU9O7z7P4YfvndaGyc8s//2s=
+github.com/kwilteam/action-grammar-go v0.1.0 h1:pAjWZUYlDwQUWpQz5uOPQDIz1TLWXyLY4gribS7UTBY=
+github.com/kwilteam/action-grammar-go v0.1.0/go.mod h1:hHGHtnrJpASW9P+F7pdr/EP2M1Hxy1N9Wx/TmjVdV6I=
+github.com/kwilteam/kwil-db/parse v0.1.1 h1:NGydeWRpACUOpi+KkVyqtWHPzwPzjeM5FTBL3yTBFqo=
+github.com/kwilteam/kwil-db/parse v0.1.1/go.mod h1:dcCGZsaGzZmRDv1l0TPHoHRLt1IFYiFs/yyuO56t95Y=
+github.com/kwilteam/sql-grammar-go v0.1.0 h1:rSS7DER9PWVDmFwNyoInG5oXrn+E9UrZkjref84L4Qk=
+github.com/kwilteam/sql-grammar-go v0.1.0/go.mod h1:A9AXaH5Vl/uPsY88fWqvU9O7z7P4YfvndaGyc8s//2s=
 github.com/pganalyze/pg_query_go/v5 v5.1.0 h1:MlxQqHZnvA3cbRQYyIrjxEjzo560P6MyTgtlaf3pmXg=
 github.com/pganalyze/pg_query_go/v5 v5.1.0/go.mod h1:FsglvxidZsVN+Ltw3Ai6nTgPVcK2BPukH3jCDEqc1Ug=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/kuneiform-grammar b/kuneiform-grammar
index c9e1acf..94209c5 160000
--- a/kuneiform-grammar
+++ b/kuneiform-grammar
@@ -1 +1 @@
-Subproject commit c9e1acfbf3721df1cf8396dad20ddbdbe65c1aa6
+Subproject commit 94209c50a9951b3e844a95c1a9f3fa5cc50f592e