diff --git a/Directory.Build.targets b/Directory.Build.targets
index 321f612..e46739e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -21,8 +21,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
+    <PackageReference Update="Antlr4.Runtime.Standard" Version="4.13.1" />
+    <PackageReference Update="Antlr4BuildTasks" Version="12.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -42,8 +42,8 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
-		<PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
+		<PackageReference Update="Antlr4.Runtime.Standard" Version="4.13.1" />
+		<PackageReference Update="Antlr4BuildTasks" Version="12.10.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/Balea/Authorization/Abac/Grammars/BAL/BALVisitor.cs b/src/Balea/Authorization/Abac/Grammars/BAL/BALVisitor.cs
index 4c60c87..9845747 100644
--- a/src/Balea/Authorization/Abac/Grammars/BAL/BALVisitor.cs
+++ b/src/Balea/Authorization/Abac/Grammars/BAL/BALVisitor.cs
@@ -1,10 +1,9 @@
 using Antlr4.Runtime.Misc;
 using Balea.Authorization.Abac.Context;
-using Balea.Authorization.Abac.Grammars.BAL;
 using System;
 using System.Globalization;
 using System.Linq.Expressions;
-using static Balea.Authorization.Abac.Grammars.BAL.BalParser;
+using static BalParser;
 
 namespace Balea.DSL.Grammar.Bal
 {
diff --git a/src/Balea/Authorization/Abac/Parsers/BALParser.cs b/src/Balea/Authorization/Abac/Parsers/BALParser.cs
index cecf930..77f7c49 100644
--- a/src/Balea/Authorization/Abac/Parsers/BALParser.cs
+++ b/src/Balea/Authorization/Abac/Parsers/BALParser.cs
@@ -1,7 +1,6 @@
 using Antlr4.Runtime;
 using Balea.Authorization.Abac.Context;
 using Balea.Authorization.Abac.Grammars;
-using Balea.Authorization.Abac.Grammars.BAL;
 using Balea.DSL.Grammar.Bal;
 
 namespace Balea.Authorization.Abac.Parsers
diff --git a/src/Balea/Balea.csproj b/src/Balea/Balea.csproj
index 5df9c91..f609aeb 100644
--- a/src/Balea/Balea.csproj
+++ b/src/Balea/Balea.csproj
@@ -18,9 +18,12 @@
  
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Antlr4.CodeGenerator" />
-    <PackageReference Include="Antlr4.Runtime" />
+    <PackageReference Include="Antlr4BuildTasks" />
+    <PackageReference Include="Antlr4.Runtime.Standard" />
   </ItemGroup>
-      
 
+   <ItemGroup>
+     <Antlr4 Include="Authorization/Abac/Grammars/BAL/Bal.g4" />
+   </ItemGroup>
+      
 </Project>
diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj
index 49710f5..e6681e2 100644
--- a/test/FunctionalTests/FunctionalTests.csproj
+++ b/test/FunctionalTests/FunctionalTests.csproj
@@ -49,11 +49,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Antlr4.CodeGenerator">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Antlr4.Runtime" />
+    <PackageReference Include="Antlr4BuildTasks" />
+    <PackageReference Include="Antlr4.Runtime.Standard" />
   </ItemGroup>
   <ItemGroup>
     <None Update="balea.json">