diff --git a/benchmark/csharp/Tpch/Tpch.csproj b/benchmark/csharp/Tpch/Tpch.csproj
index 7985a31b0..815dca6f3 100644
--- a/benchmark/csharp/Tpch/Tpch.csproj
+++ b/benchmark/csharp/Tpch/Tpch.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Tpch</RootNamespace>
     <AssemblyName>Tpch</AssemblyName>
@@ -11,7 +11,6 @@
   <ItemGroup>
     <!-- Workaround https://github.com/dotnet/project-system/issues/935 -->
     <None Include="**/*.cs" />
-    
     <ProjectReference Include="..\..\..\src\csharp\Microsoft.Spark.Experimental\Microsoft.Spark.Experimental.csproj" />
     <ProjectReference Include="..\..\..\src\csharp\Microsoft.Spark\Microsoft.Spark.csproj" />
   </ItemGroup>
@@ -21,16 +20,7 @@
       <PropertyGroup>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       </PropertyGroup>
-      
-      <ItemGroup>
-        <Compile Remove="VectorFunctions.cs" />
-      </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Compile Remove="VectorFunctions.intrinsics.cs" />
-      </ItemGroup>
-    </Otherwise>
   </Choose>
-  
+
 </Project>
diff --git a/benchmark/csharp/Tpch/TpchFunctionalQueries.cs b/benchmark/csharp/Tpch/TpchFunctionalQueries.cs
index cb53fdabd..6a965476b 100644
--- a/benchmark/csharp/Tpch/TpchFunctionalQueries.cs
+++ b/benchmark/csharp/Tpch/TpchFunctionalQueries.cs
@@ -60,14 +60,8 @@ internal void Q1()
               .Show();
         }
 
-        internal void Q1v()
-        {
-            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
-                (price, discount) => VectorFunctions.ComputeDiscountPrice(price, discount));
-
-            Func<Column, Column, Column, Column> total = VectorUdf<DoubleArray, DoubleArray, DoubleArray, DoubleArray>(
-                (price, discount, tax) => VectorFunctions.ComputeTotal(price, discount, tax));
-
+        internal void Q1aCommon(Func<Column, Column, Column> discPrice, Func<Column, Column, Column, Column> total)
+        {            
             _lineitem.Filter(Col("l_shipdate") <= "1998-09-02")
               .GroupBy(Col("l_returnflag"), Col("l_linestatus"))
               .Agg(Sum(Col("l_quantity")).As("sum_qty"), Sum(Col("l_extendedprice")).As("sum_base_price"),
@@ -82,6 +76,28 @@ internal void Q1v()
               .Show();
         }
 
+        internal void Q1a()
+        {
+            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount) => VectorFunctions.ComputeDiscountPrice(price, discount));
+
+            Func<Column, Column, Column, Column> total = VectorUdf<DoubleArray, DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount, tax) => VectorFunctions.ComputeTotal(price, discount, tax));
+
+            Q1aCommon(discPrice, total);
+        }
+
+        internal void Q1ha()
+        {
+            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount) => VectorFunctionsIntrinsics.ComputeDiscountPrice(price, discount));
+
+            Func<Column, Column, Column, Column> total = VectorUdf<DoubleArray, DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount, tax) => VectorFunctionsIntrinsics.ComputeTotal(price, discount, tax));
+
+            Q1aCommon(discPrice, total);
+        }
+
         internal void Q2()
         {
             DataFrame europe = _region.Filter(Col("r_name") == "EUROPE")
@@ -227,12 +243,9 @@ internal void Q8()
               .Show();
         }
 
-        internal void Q8v()
+        internal void Q8aCommon(Func<Column, Column, Column> discPrice)
         {
-            Func<Column, Column> getYear = Udf<string, string>(x => x.Substring(0, 4));
-            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
-                (price, discount) => VectorFunctions.ComputeDiscountPrice(price, discount));
-
+            Func<Column, Column> getYear = Udf<string, string>(x => x.Substring(0, 4));            
             Func<Column, Column, Column> isBrazil = Udf<string, double, double>((x, y) => x == "BRAZIL" ? y : 0);
 
             DataFrame fregion = _region.Filter(Col("r_name") == "AMERICA");
@@ -261,6 +274,20 @@ internal void Q8v()
               .Show();
         }
 
+        internal void Q8a()
+        {            
+            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount) => VectorFunctions.ComputeDiscountPrice(price, discount));
+            Q8aCommon(discPrice);
+        }
+
+        internal void Q8ha()
+        {            
+            Func<Column, Column, Column> discPrice = VectorUdf<DoubleArray, DoubleArray, DoubleArray>(
+                (price, discount) => VectorFunctionsIntrinsics.ComputeDiscountPrice(price, discount));
+            Q8aCommon(discPrice);
+        }
+
         internal void Q9()
         {
             Func<Column, Column> getYear = Udf<string, string>(x => x.Substring(0, 4));
diff --git a/benchmark/csharp/Tpch/VectorFunctions.intrinsics.cs b/benchmark/csharp/Tpch/VectorFunctions.intrinsics.cs
index e63849a3b..9a709c2ed 100644
--- a/benchmark/csharp/Tpch/VectorFunctions.intrinsics.cs
+++ b/benchmark/csharp/Tpch/VectorFunctions.intrinsics.cs
@@ -9,7 +9,7 @@
 
 namespace Tpch
 {
-    internal static class VectorFunctions
+    internal static class VectorFunctionsIntrinsics
     {
         internal static unsafe DoubleArray ComputeTotal(DoubleArray price, DoubleArray discount, DoubleArray tax)
         {